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

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

Author: eFfeM
Date: 2008-05-02 12:13:15 +0200 (Fri, 02 May 2008)
New Revision: 1069

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
Log:
let the functions that write to dongle and fux use the raw function instead of
duplicating it


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-05-02 10:06:55 UTC (rev 1068)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-05-02 10:13:15 UTC (rev 1069)
@@ -743,18 +743,16 @@
     usb_write_TuxDroid(frame_reset_dongle, TUX_SEND_LENGTH);
 }
 
-/** 
- *  Send a command to Tuxdroid.
- *  @param data 4 bytes array
+/**
+ *  Send a raw command 
+ *  @param data 5 bytes array
  */
-LIBLOCAL bool
-tux_usb_send_to_tux(const unsigned char* data)
+LIBLOCAL bool 
+tux_usb_send_raw(const unsigned char* data)
 {
     int ret;
-    unsigned char frame[TUX_SEND_LENGTH] = {0, data[0], data[1], 
-                                            data[2], data[3]};
 
-    ret = tux_usb_write(frame);
+    ret = tux_usb_write(data);
     
     usleep(10000);
     
@@ -768,50 +766,28 @@
     }
 }
 
-/**
- *  Send a command to fux dongle.
+/** 
+ *  Send a command to Tuxdroid.
  *  @param data 4 bytes array
  */
-LIBLOCAL bool 
-tux_usb_send_to_dongle(const unsigned char* data)
+LIBLOCAL bool
+tux_usb_send_to_tux(const unsigned char* data)
 {
-    int ret;
-    unsigned char frame[TUX_SEND_LENGTH] = {1, data[0], data[1], 
-                                             data[2], data[3]};
+    unsigned char frame[TUX_SEND_LENGTH] = {0, data[0], data[1], 
+                                            data[2], data[3]};
 
-    ret = tux_usb_write(frame);
-    
-    usleep(10000);
-    
-    if (ret != TuxUSBNoError)
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
+    return tux_usb_send_raw(frame);
 }
 
 /**
- *  Send a raw command to fux dongle.
+ *  Send a command to fux dongle.
  *  @param data 4 bytes array
  */
 LIBLOCAL bool 
-tux_usb_send_raw(const unsigned char* data)
+tux_usb_send_to_dongle(const unsigned char* data)
 {
-    int ret;
+    unsigned char frame[TUX_SEND_LENGTH] = {1, data[0], data[1], 
+                                             data[2], data[3]};
 
-    ret = tux_usb_write(data);
-    
-    usleep(10000);
-    
-    if (ret != TuxUSBNoError)
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
+    return tux_usb_send_raw(frame);
 }