[tuxdroid-svn] r132 - daemon/trunk/libs

[remi <c2m...@c2...>]

Author: remi
Date: 2007-03-02 16:37:13 +0100 (Fri, 02 Mar 2007)
New Revision: 132

Modified:
   daemon/trunk/libs/USBDaemon_usb_enum.c
   daemon/trunk/libs/USBDaemon_usb_enum.h
   daemon/trunk/libs/USBDaemon_usb_readWrite.c
   daemon/trunk/libs/USBDaemon_usb_readWrite.h
Log:
UPD : wait 10 "usb busy error" consecutive before exiting the daemon

Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c	2007-03-02 13:33:44 UTC (rev 131)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c	2007-03-02 15:37:13 UTC (rev 132)
@@ -109,6 +109,7 @@
         // Reinit audio channel
         send_usb_dongle_cmd(0x02,0,0,0);
         current_audio_channel=0;
+        busy_count=0;
         // Read loop
         while(tux_handle){
             usb_get_status_TuxDroid();

Modified: daemon/trunk/libs/USBDaemon_usb_enum.h
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.h	2007-03-02 13:33:44 UTC (rev 131)
+++ daemon/trunk/libs/USBDaemon_usb_enum.h	2007-03-02 15:37:13 UTC (rev 132)
@@ -21,7 +21,7 @@
 /*_____________________ I N C L U D E S____________________________________ */
 #include <usb.h>
 /*_____________________ D E F I N E S ______________________________________*/
-/*_____________________ V A R I A B L E S ___________________________________*/
+/*_____________________ V A R I A B L E S __________________________________*/
 usb_dev_handle *tux_handle;
 struct usb_device* tux_device;
 int TUX_USB_STATUS;

Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-02 13:33:44 UTC (rev 131)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-02 15:37:13 UTC (rev 132)
@@ -24,6 +24,7 @@
 #include "USBDaemon_globals.h"
 #include "USBDaemon_status_table.h"
 #include "USBDaemon_tcp_server.h"
+#include "USBDaemon_usb_readWrite.h"
 /*_____________________ F U N C T I O N S __________________________________*/
 
     // ***********************************************************************
@@ -71,10 +72,14 @@
         idx=usb_bulk_write(tux_handle,TUX_WRITE_EP,(char*)cmd_send,5,TUX_WRITE_TIMEOUT);
         if (idx<=0) {
             printf("Error : Tux dongle is busy or disconnected\n");
-            send_daemon_disconnected();
+            busy_count++;
+            if(busy_count>9){
+                send_daemon_disconnected();
     pthread_mutex_unlock(&usb_mutex);
-            exit(1);
+                exit(1);
+            }
         }
+        busy_count=0;
         idx=usb_bulk_read(tux_handle,TUX_READ_EP,(char*)datas,64,TUX_READ_TIMEOUT);
         if (idx<=0){
     pthread_mutex_unlock(&usb_mutex);

Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.h
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.h	2007-03-02 13:33:44 UTC (rev 131)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.h	2007-03-02 15:37:13 UTC (rev 132)
@@ -21,6 +21,8 @@
 /*_____________________ I N C L U D E S____________________________________ */
 #include <usb.h>
 /*_____________________ D E F I N E S ______________________________________*/
+/*_____________________ V A R I A B L E S __________________________________*/
+unsigned char busy_count;
 /*_____________________ F U N C T I O N S __________________________________*/
 void usb_read_TuxDroid();
 void usb_get_status_TuxDroid();