[tuxdroid-svn] r137 - in daemon/trunk: . libs

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

Author: jaguarondi
Date: 2007-03-09 00:23:31 +0100 (Fri, 09 Mar 2007)
New Revision: 137

Modified:
   daemon/trunk/Makefile
   daemon/trunk/libs/USBDaemon_usb_enum.c
   daemon/trunk/libs/USBDaemon_usb_readWrite.c
   daemon/trunk/main.c
Log:
- UPD: added some debugging messages for libusb when compiled in debug mode

Modified: daemon/trunk/Makefile
===================================================================
--- daemon/trunk/Makefile	2007-03-06 14:45:42 UTC (rev 136)
+++ daemon/trunk/Makefile	2007-03-08 23:23:31 UTC (rev 137)
@@ -18,7 +18,7 @@
   TARGET = tuxdaemon
   C_INCLUDE_DIRS = -I"../../../../../../../usr/include/glib-2.0" -I"../../../../../../../usr/lib/glib-2.0/include" 
   C_PREPROC = 
-  CFLAGS = -pipe  -Wall -g2 -O0 
+  CFLAGS = -pipe  -Wall -g2 -O0 -DUSB_DEBUG
   LIB_DIRS = -L"../../../../../../../usr/include/glib-2.0" -L"../../../../../../../usr/lib/glib-2.0/include" 
   LIBS = -lglib-2.0 -lgthread-2.0 -lusb 
   LDFLAGS = -pipe 

Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c	2007-03-06 14:45:42 UTC (rev 136)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c	2007-03-08 23:23:31 UTC (rev 137)
@@ -20,6 +20,7 @@
 /* $Id$ */
 /*_____________________ I N C L U D E S____________________________________ */
 #include <stdio.h>
+#include <errno.h>
 #include "USBDaemon_usb_enum.h"
 #include "USBDaemon_globals.h"
 #include "USBDaemon_status_table.h"
@@ -63,8 +64,9 @@
         int error;
         
         // Open usb device
-        if (!(tux_hdl=usb_open(tux_dev))){
-            printf("Open USB error\n");
+        tux_hdl = usb_open(tux_dev);
+        if (!tux_hdl) {
+            printf("Can't open device: %s (%d)\n", strerror(errno), errno);
             return NULL;
         }
         
@@ -74,7 +76,7 @@
             usb_detach_kernel_driver_np(tux_hdl,TUX_INTERFACE);
             error=usb_claim_interface(tux_hdl,TUX_INTERFACE);
             if (error!=0){
-                printf("Claim interface error\n");
+                printf("Can't claim interface: %s (%d)\n", strerror(errno), errno);
                 return NULL;
             }
         }
@@ -104,6 +106,7 @@
             printf("You must load the daemon in root mode\n");
             exit(1);
         }
+
         usleep(50000);
         TUX_USB_STATUS=1;
         // Reinit audio channel

Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-06 14:45:42 UTC (rev 136)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-08 23:23:31 UTC (rev 137)
@@ -83,6 +83,7 @@
         }
         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);
         if (idx<=0){
     pthread_mutex_unlock(&usb_mutex);
             return;
@@ -130,6 +131,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);
         counter=0;
         CSF=CMD_STATUS_FLAG;
     pthread_mutex_unlock(&usb_mutex);

Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c	2007-03-06 14:45:42 UTC (rev 136)
+++ daemon/trunk/main.c	2007-03-08 23:23:31 UTC (rev 137)
@@ -36,6 +36,11 @@
 #include "libs/USBDaemon_tcp_server.h"
 #include "libs/USBDaemon_status_table.h"
 #include "version.h"
+
+
+/* DEBUG */
+#define LIBUSB_DEBUG_LEVEL 255
+
 /*_____________________ F U N C T I O N S __________________________________*/
 
 struct version_s version = {0, 0, 0, "\0", "\0", 0};
@@ -152,6 +157,13 @@
         
         // Print daemon informations
         print_info_daemon();
+
+#ifdef USB_DEBUG
+        // Set libusb debug level
+        usb_set_debug(LIBUSB_DEBUG_LEVEL);
+        usb_init();
+#endif
+
         // Program arguments
         daemonized=0;
         shell_view=0;