[tuxdroid-svn] r997 - software_suite_v2/middleware/tuxdriver/trunk/src

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

Author: eFfeM
Date: 2008-04-20 21:18:09 +0200 (Sun, 20 Apr 2008)
New Revision: 997

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
Log:
curlies


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-04-20 19:12:47 UTC (rev 996)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-04-20 19:18:09 UTC (rev 997)
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "log.h"
 #ifdef WIN32
 #   include "usb.h"
 #else
@@ -32,7 +33,6 @@
 #ifdef USE_MUTEX
 #   include "threading_uniform.h"
 #endif
-#include "log.h"
 
 static usb_dev_handle *tux_handle = NULL;
 static struct usb_device *tux_device = NULL;
@@ -191,21 +191,28 @@
     mutex_lock(__connected_mutex);
 #endif
     usb_connected = value;
-    if (value) {
+    if (value)
+    {
 #ifdef USE_MUTEX
         mutex_lock(__callback_mutex);
 #endif
         if (dongle_connect_function)
+	{
             dongle_connect_function();
+	}
 #ifdef USE_MUTEX
         mutex_unlock(__callback_mutex);
 #endif
-    } else {
+    }
+    else
+    {
 #ifdef USE_MUTEX
         mutex_lock(__callback_mutex);
 #endif
         if (dongle_disconnect_function)
+	{
             dongle_disconnect_function();
+	}
 #ifdef USE_MUTEX
         mutex_unlock(__callback_mutex);
 #endif
@@ -255,14 +262,19 @@
     tux_dev2 = NULL;
 
     for (bus = usb_busses; bus; bus = bus->next)
+    {
         for (tux_dev = bus->devices; tux_dev; tux_dev = tux_dev->next)
+	{
             if (tux_dev->descriptor.idVendor == TUX_VID
                 && tux_dev->descriptor.idProduct == TUX_PID)
             {
                 if (tux_dev->config->bNumInterfaces > 1)
+		{
                     tux_dev2 = tux_dev;
+		}
             }
-                
+	}
+    }
     return tux_dev2;
 }
 
@@ -280,7 +292,9 @@
     tux_hdl = usb_open(tux_dev);
 
     if (!tux_hdl)
+    {
         return NULL;
+    }
     
     /* Setting configuration is normally not necessary as the snd-usb-audio
      * will already have that done at this point. But in case we don't have usb
@@ -291,10 +305,12 @@
     /* Claim device interface */
     print_usb_debug("usb_claim_interface(tux_hdl, TUX_INTERFACE)");
     error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
-    if (error != 0) {
+    if (error != 0)
+    {
         print_usb_debug("usb_claim_interface(tux_hdl, TUX_INTERFACE)");
         error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
-        if (error != 0) {
+        if (error != 0)
+	{
             usb_reset(tux_hdl);
             return NULL;
         }
@@ -312,15 +328,17 @@
     read_error_counter = 0;
     
     tux_device = usb_find_TuxDroid();
-    if (!tux_device) {
+    if (!tux_device)
+    {
         log_error("Fux not found");
         return TuxUSBFuxNotFound;
-	}
+    }
 
     /* Old firmware should be discarded here */
 #ifndef USB_DEBUG
     print_usb_debug("read tux_device->descriptor.bcdDevice");
-    if (tux_device->descriptor.bcdDevice < MIN_FIRMWARE_VERSION) {
+    if (tux_device->descriptor.bcdDevice < MIN_FIRMWARE_VERSION)
+    {
         log_error("Your fux firmware is too old");
         return TuxUSBFirmwareTooOld;
     }
@@ -328,7 +346,8 @@
 
     /* Get Device handle */
     tux_handle = usb_open_TuxDroid(tux_device);
-    if (tux_handle == NULL) {
+    if (tux_handle == NULL)
+    {
         log_error("Can't open the USB device");
         return TuxUSBHandleNotOpen;
     }
@@ -345,13 +364,15 @@
 tux_usb_release(void)
 {
     print_usb_debug("usb_release_interface(tux_handle, TUX_INTERFACE)");
-    if (usb_release_interface(tux_handle, TUX_INTERFACE) < 0) {
+    if (usb_release_interface(tux_handle, TUX_INTERFACE) < 0)
+    {
         log_error("TuxUSBCantReleaseInterface");
         return TuxUSBCantReleaseInterface;
     }
 
     print_usb_debug("usb_close(tux_handle)");
-    if (usb_close(tux_handle) < 0) {
+    if (usb_close(tux_handle) < 0)
+    {
         log_error("Can't close the USB device");
         return TuxUSBCantCloseDevice;
     }
@@ -413,7 +434,8 @@
     unsigned char dest;
 #endif
     
-    if (!tux_usb_connected()) {
+    if (!tux_usb_connected())
+    {
         log_error("Fux USB device not connected");
         return TuxUSBNotConnected;
     }
@@ -424,10 +446,12 @@
     
 #ifndef USB_DEBUG
     /* If rf state is offline, don't send the command */
-    if (!last_knowed_rf_state) {
+    if (!last_knowed_rf_state)
+    {
         buff2 = (void *)buff;
         dest = *(unsigned char *)buff2++;
-        if (dest == 0) {
+        if (dest == 0)
+	{
 #ifdef USE_MUTEX
             mutex_unlock(__read_write_mutex);
 #endif
@@ -442,15 +466,17 @@
     mutex_unlock(__read_write_mutex);
 #endif
 	
-	if (ret != TUX_SEND_LENGTH) {
-        if (is_error_no_device(ret)) {
-            set_connected(false);
-            tux_usb_release();
-            log_error("Fux is disconnected");
-            return TuxUSBDisconnected;
-        }
-        log_error("Failed to write on USB device (%d)", ret);   
-		return TuxUSBWriteError;
+	if (ret != TUX_SEND_LENGTH)
+	{
+	    if (is_error_no_device(ret))
+	    {
+		set_connected(false);
+		tux_usb_release();
+		log_error("Fux is disconnected");
+		return TuxUSBDisconnected;
+	    }
+	    log_error("Failed to write on USB device (%d)", ret);   
+		    return TuxUSBWriteError;
 	}
     return TuxUSBNoError;
 }
@@ -485,21 +511,27 @@
     data_buf = (char *)data;
     data_buf += 4;
     
-    if (last_knowed_rf_state != rf_state) {
+    if (last_knowed_rf_state != rf_state)
+    {
         last_knowed_rf_state = rf_state;
 #ifdef USE_MUTEX      
         mutex_lock(__callback_mutex);
 #endif
         if (rf_state_callback_function)
+	{
             rf_state_callback_function(last_knowed_rf_state);
+	}
 #ifdef USE_MUTEX
         mutex_unlock(__callback_mutex);
 #endif
     }
     
-    for (i = 0; i < packet_count; i++) {
+    for (i = 0; i < packet_count; i++)
+    {
         for (j = 0; j < 4; j++)
+	{
             packet_data[j] = (unsigned char)data_buf[j];
+	}
 #ifdef USE_MUTEX      
         mutex_lock(__callback_mutex);
 #endif
@@ -521,7 +553,8 @@
 {
     int ret;
     
-    if (!tux_usb_connected()) {
+    if (!tux_usb_connected())
+    {
         log_error("Fux USB device not connected");
         return TuxUSBNotConnected;
     }
@@ -532,11 +565,13 @@
     mutex_lock(__read_write_mutex);
 #endif
     ret = usb_write_TuxDroid(frame_status_request, TUX_SEND_LENGTH);
-    if (ret != TUX_SEND_LENGTH) {
+    if (ret != TUX_SEND_LENGTH)
+    {
 #ifdef USE_MUTEX
         mutex_unlock(__read_write_mutex);
 #endif
-        if (is_error_no_device(ret)) {  /* USB device error */
+        if (is_error_no_device(ret))
+	{  /* USB device error */
             set_connected(false);
             tux_usb_release();
             log_error("Fux is disconnected");
@@ -551,8 +586,10 @@
     mutex_unlock(__read_write_mutex);
 #endif
     
-    if (ret != TUX_RECEIVE_LENGTH) {    /* Frame not have 64 bytes */
-        if (is_error_no_device(ret)) {  /* USB device error */
+    if (ret != TUX_RECEIVE_LENGTH)
+    {    /* Frame not have 64 bytes */
+        if (is_error_no_device(ret))
+	{  /* USB device error */
             set_connected(false);
             tux_usb_release();
             log_error("Fux is disconnected");
@@ -560,8 +597,11 @@
         }
         log_error("Failed to read on USB device (%d)", ret);
         return TuxUSBReadError;
-    } else
+    }
+    else
+    {
         read_error_counter = 0;
+    }
     
     process_usb_frame((char *)buf);
 
@@ -616,20 +656,27 @@
     
     set_read_loop_started(true);
     
-    while (tux_usb_connected()) {
+    while (tux_usb_connected())
+    {
         current_timeout += TUX_READ_LOOP_INTERVAL;
         
         if (!tux_usb_connected())
+	{
             break;
+	}
         
         tux_usb_read(data);
         tux_usb_read(data);
         
         if (loop_cycle_complete_function)
+	{
             loop_cycle_complete_function();
+	}
         
         while (get_time() < current_timeout)
+	{
             usleep(1000);
+	}
     }
     
     set_read_loop_started(false);
@@ -644,11 +691,15 @@
     int ret;
     
     if (get_read_loop_started())
+    {
         return TuxUSBAlreadyStarted;
+    }
 
     ret = tux_usb_capture();
     if (ret != TuxUSBNoError)
+    {
         return ret;
+    }
     
     last_knowed_rf_state = 0;
     
@@ -667,7 +718,9 @@
     int ret;
         
     if (!tux_usb_connected())
+    {
         return TuxUSBNoError;
+    }
         
     set_connected(false);
     
@@ -675,7 +728,9 @@
     
     ret = tux_usb_release();
     if (ret != TuxUSBNoError)
+    {
         return ret;
+    }
  
     return TuxUSBNoError;
 }
@@ -705,9 +760,13 @@
     usleep(10000);
     
     if (ret != TuxUSBNoError)
+    {
         return false;
+    }
     else
+    {
         return true;
+    }
 }
 
 /**
@@ -726,9 +785,13 @@
     usleep(10000);
     
     if (ret != TuxUSBNoError)
+    {
         return false;
+    }
     else
+    {
         return true;
+    }
 }
 
 /**
@@ -745,7 +808,11 @@
     usleep(10000);
     
     if (ret != TuxUSBNoError)
+    {
         return false;
+    }
     else
+    {
         return true;
+    }
 }