fixing up OZY things

diff --git a/about_menu.c b/about_menu.c
index 5860008dae2febf01c3a673c686585902a6aed47..a8e447bfb14f1c7bf8acadd50bec7b28743e338c 100644 (file)
--- a/about_menu.c
+++ b/about_menu.c
@@ -130,7 +130,7 @@ void about_menu(GtkWidget *parent) {
     case NEW_PROTOCOL:
 #ifdef USBOZY
       if(radio->device==DEVICE_OZY) {
-        sprintf(text,"%s\nDevice OZY: USB /dev/ozy",text,radio->protocol==ORIGINAL_PROTOCOL?"1":"2",radio->software_version/10,radio->software_version%10);
+        sprintf(text,"%s\nDevice OZY: USB /dev/ozy Protocol %s v%d.%d",text,radio->protocol==ORIGINAL_PROTOCOL?"1":"2",radio->software_version/10,radio->software_version%10);
       } else {
 #endif
         

diff --git a/old_protocol.c b/old_protocol.c
index 035b30bc713922f8b301aaa4cd4ba90e88fcc495..188dfd552569bd805da5d77b861cceac9a77e026 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -243,7 +243,7 @@ static GThread *ozy_EP6_rx_thread_id;
 static gpointer ozy_ep4_rx_thread(gpointer arg);
 static gpointer ozy_ep6_rx_thread(gpointer arg);
 static void start_usb_receive_threads();
-static int ozyusb_write(char* buffer,int length);
+static void ozyusb_write(unsigned char* buffer,int length);
 #define EP6_IN_ID  0x86                         // end point = 6, direction toward PC
 #define EP2_OUT_ID  0x02                        // end point = 2, direction from PC
 #define EP6_BUFFER_SIZE 2048
@@ -342,6 +342,7 @@ static void start_usb_receive_threads()
 //
 static gpointer ozy_ep4_rx_thread(gpointer arg)
 {
+  return NULL;
 }
 
 //
@@ -381,6 +382,7 @@ static gpointer ozy_ep6_rx_thread(gpointer arg) {
     }
 
   }
+  return NULL;
 }
 #endif
 
@@ -1621,7 +1623,7 @@ void ozy_send_buffer() {
 }
 
 #ifdef USBOZY
-static int ozyusb_write(char* buffer,int length)
+static void ozyusb_write(unsigned char* buffer,int length)
 {
   int i;
 

diff --git a/ozyio.c b/ozyio.c
index c71121e26e22bb9355b5cd9ec0be5ec259a67e53..125cf25d5f8f4b67cf93df190e775cf9aec23a02 100644 (file)
--- a/ozyio.c
+++ b/ozyio.c
@@ -573,7 +573,6 @@ static int file_exists (const char * fileName)
        return ( i == 0 ) ? 1 : 0 ;
 }
 
-#ifdef __linux__
 int filePath (char *sOut, const char *sIn) {
        int rc = 0;
 
@@ -617,7 +616,6 @@ int filePath (char *sOut, const char *sIn) {
        }
        return rc;
 }
-#endif
 
 
 

diff --git a/radio_menu.c b/radio_menu.c
index 9ee2fe37b808ce24210c985f1162d68bf481e55c..457606853482823cc05445a901129bedd9df34a1 100644 (file)
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -617,7 +617,7 @@ void radio_menu(GtkWidget *parent) {
   col++;
 
 #ifdef USBOZY
-  if (protocol==ORIGINAL_PROTOCOL && (device == DEVICE_OZY) || (device == DEVICE_METIS))
+  if (protocol==ORIGINAL_PROTOCOL && (device == DEVICE_OZY || device == DEVICE_METIS))
 #else
   if (protocol==ORIGINAL_PROTOCOL && radio->device == DEVICE_METIS)
 #endif