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

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

Author: remi
Date: 2007-03-09 14:19:50 +0100 (Fri, 09 Mar 2007)
New Revision: 140

Modified:
   daemon/trunk/libs/USBDaemon_usb_readWrite.c
Log:
UPD : WARNING 
- Usb transfer has been passed to interrupt mode
- Some updates for debugging

Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-09 13:19:24 UTC (rev 139)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-09 13:19:50 UTC (rev 140)
@@ -40,13 +40,12 @@
         if (!TUX_USB_STATUS) return;
         for(i=0;i<5;i++){
     pthread_mutex_lock(&usb_mutex);
-            idx=usb_bulk_read(tux_handle,TUX_READ_EP,(char*)datas,TUX_RECV_LENGTH,TUX_READ_TIMEOUT);
+            idx=usb_interrupt_read(tux_handle,TUX_READ_EP,(char*)datas,TUX_RECV_LENGTH,TUX_READ_TIMEOUT);
     pthread_mutex_unlock(&usb_mutex);
             if(idx!=TUX_RECV_LENGTH) 
                 i=0;
             else
                 update_raw_status_table(datas);
-                //printf("%.2x %.2x %.2x %.2x %.2x\n",datas[0],datas[1],datas[2],datas[3],datas[4]);
         }
     }
     
@@ -69,11 +68,11 @@
     pthread_mutex_unlock(&usb_mutex);
             return;
         }
-        idx=usb_bulk_write(tux_handle,TUX_WRITE_EP,(char*)cmd_send,5,TUX_WRITE_TIMEOUT);
+        idx=usb_interrupt_write(tux_handle,TUX_WRITE_EP,(char*)cmd_send,5,TUX_WRITE_TIMEOUT);
         if (idx<=0) {
             busy_count++;
-            printf("Error : Tux dongle is busy or disconnected : %d of 10\n",busy_count);
             if(busy_count>9){
+                printf("Error : Tux dongle is busy or disconnected\n");
                 send_daemon_disconnected();
     pthread_mutex_unlock(&usb_mutex);
                 exit(1);
@@ -82,8 +81,7 @@
             return;
         }
         busy_count=0;
-        idx=usb_bulk_read(tux_handle,TUX_READ_EP,(char*)datas,64,TUX_READ_TIMEOUT);
-        //idx=usb_interrupt_read(tux_handle,TUX_READ_EP,(char*)datas,64,TUX_READ_TIMEOUT);
+        idx=usb_interrupt_read(tux_handle,TUX_READ_EP,(char*)datas,64,TUX_READ_TIMEOUT);
         if (idx<=0){
     pthread_mutex_unlock(&usb_mutex);
             return;
@@ -130,8 +128,7 @@
         }
         // Send datas
         CMD_STATUS_FLAG=1;
-        idx=usb_bulk_write(tux_handle,TUX_WRITE_EP,(char*)datas,TUX_SEND_LENGTH,TUX_WRITE_TIMEOUT);
-        //idx=usb_interrupt_write(tux_handle,TUX_WRITE_EP,(char*)datas,TUX_SEND_LENGTH,TUX_WRITE_TIMEOUT);
+        idx=usb_interrupt_write(tux_handle,TUX_WRITE_EP,(char*)datas,TUX_SEND_LENGTH,TUX_WRITE_TIMEOUT);
         counter=0;
         CSF=CMD_STATUS_FLAG;
     pthread_mutex_unlock(&usb_mutex);