[tuxdroid-svn] r1278 - in software_suite_v2/middleware/tuxdriver/trunk: src unix win32

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

Author: remi
Date: 2008-06-26 22:16:02 +0200 (Thu, 26 Jun 2008)
New Revision: 1278

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
   software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile
   software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile
Log:
* Enabled / fixed the mutex protections. Need for asynchronous use of cmd sending and status requesting from the USB.

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c	2008-06-26 14:26:03 UTC (rev 1277)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c	2008-06-26 20:16:02 UTC (rev 1278)
@@ -1248,6 +1248,9 @@
         {
             if (ret != E_TUXDRV_INVALIDCOMMAND)
             {
+#ifdef USE_MUTEX
+                mutex_unlock(__macro_mutex);
+#endif
                 return(ret);
             }
         }
@@ -1259,6 +1262,9 @@
             {
                 if (ret != E_TUXDRV_INVALIDCOMMAND)
                 {
+#ifdef USE_MUTEX
+                    mutex_unlock(__macro_mutex);
+#endif
                     return(ret);
                 }
             }
@@ -1296,6 +1302,9 @@
             {
                 if (ret != E_TUXDRV_INVALIDCOMMAND)
                 {
+#ifdef USE_MUTEX
+                    mutex_unlock(__macro_mutex);
+#endif   
                     return(ret);
                 }
             }

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-06-26 14:26:03 UTC (rev 1277)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-06-26 20:16:02 UTC (rev 1278)
@@ -504,15 +504,6 @@
 
     if (make_event)
     {
-#ifdef USE_MUTEX
-        mutex_lock(__status_mutex);
-#endif
-
-
-#ifdef USE_MUTEX
-        mutex_unlock(__status_mutex);
-#endif
-    
         if (event_funct)
         {
             /* 

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-06-26 14:26:03 UTC (rev 1277)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-06-26 20:16:02 UTC (rev 1278)
@@ -171,36 +171,23 @@
     mutex_lock(__connected_mutex);
 #endif
     usb_connected = value;
-    if (value)
-    {
 #ifdef USE_MUTEX
-        mutex_lock(__callback_mutex);
+    mutex_unlock(__connected_mutex);
 #endif
+    if (value)
+    {
         if (dongle_connect_function)
         {
             dongle_connect_function();
         }
-#ifdef USE_MUTEX
-        mutex_unlock(__callback_mutex);
-#endif
     }
     else
     {
-#ifdef USE_MUTEX
-        mutex_lock(__callback_mutex);
-#endif
         if (dongle_disconnect_function)
         {
             dongle_disconnect_function();
         }
-#ifdef USE_MUTEX
-        mutex_unlock(__callback_mutex);
-#endif
     }
-
-#ifdef USE_MUTEX
-    mutex_unlock(__connected_mutex);
-#endif
 }
 
 /**
@@ -479,7 +466,7 @@
     
     set_read_loop_started(true);
     
-    log_info("Start the statuses read loop");
+    log_info("Start the read loop");
     
     while (tux_usb_connected())
     {
@@ -505,7 +492,7 @@
     
     set_read_loop_started(false);
     
-    log_info("Statuses read loop stopped");
+    log_info("Read loop stopped");
 }
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile	2008-06-26 14:26:03 UTC (rev 1277)
+++ software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile	2008-06-26 20:16:02 UTC (rev 1278)
@@ -10,7 +10,7 @@
 TARGET = libtuxdriver.so
 C_INCLUDE_DIRS = -I"../../../../../../../usr/local/include" 
 C_PREPROC = 
-CFLAGS = -pipe -std=gnu99 -DUSB_DEBUG0 -DSHOW_EVENTS -DNO_MOTORS_CHECK -DNO_THREAD -Wall -g0 -O2 -fPIC 
+CFLAGS = -pipe -std=gnu99 -DUSE_MUTEX -Wall -g0 -O2 -fPIC 
 LIB_DIRS = 
 LIBS = -lgthread-2.0 -lm 
 LDFLAGS = -pipe -shared
@@ -44,13 +44,13 @@
 
 define build_target
 @echo Linking...
-@$(CC) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
-@ar rcs $(OUTPUT_DIR)/libtuxdriver.a $(SRC_OBJS)
+-@$(CC) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
+-@ar rcs $(OUTPUT_DIR)/libtuxdriver.a $(SRC_OBJS)
 endef
 
 define compile_source
 @echo Compiling $<
-@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
+-@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
 endef
 
 .PHONY: print_header directories

Modified: software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile	2008-06-26 14:26:03 UTC (rev 1277)
+++ software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile	2008-06-26 20:16:02 UTC (rev 1278)
@@ -10,7 +10,7 @@
 TARGET = libtuxdriver.dll
 C_INCLUDE_DIRS = -I"E:\MinGWStudio\MinGW\include\ddk"
 C_PREPROC = 
-CFLAGS = -pipe  -Wall -g2 -O0
+CFLAGS = -pipe -DUSE_MUTEX -Wall -g2 -O0
 RC_INCLUDE_DIRS = 
 RC_PREPROC = 
 RCFLAGS =