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

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

Author: neimad
Date: 2007-06-23 19:02:52 +0200 (Sat, 23 Jun 2007)
New Revision: 417

Modified:
   daemon/trunk/libs/USBDaemon_command_tux.c
   daemon/trunk/libs/USBDaemon_usb.c
   daemon/trunk/libs/USBDaemon_usb.h
Log:
* Renamed old usb_write_TuxDroid() (which effectively sends and awaits
  an ack) to usb_send_TuxDroid(), and dropped the "bytes" in new
  functions usb_{read,write}bytes_TuxDroid().


Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c	2007-06-23 16:53:35 UTC (rev 416)
+++ daemon/trunk/libs/USBDaemon_command_tux.c	2007-06-23 17:02:52 UTC (rev 417)
@@ -358,7 +358,7 @@
     usb_send[0] = 0;
     for (i = 1; i < 5; i++)
         usb_send[i] = data[i - 1];
-    result[0] = usb_write_TuxDroid(usb_send);
+    result[0] = usb_send_TuxDroid(usb_send);
 }
 
 /************************************************************************ */
@@ -936,7 +936,7 @@
     usb_frame[2] = param1;
     usb_frame[3] = param2;
     usb_frame[4] = param3;
-    return usb_write_TuxDroid(usb_frame);
+    return usb_send_TuxDroid(usb_frame);
 }
 
 /************************************************************************ */
@@ -955,7 +955,7 @@
     log_debug("USB PC->Dongle: %#x, %#x, %#x, %#x, %#x\n", data[0], data[1],
             data[2], data[3], data[4]);
 
-    return usb_writebytes_TuxDroid(data, TUX_SEND_LENGTH);
+    return usb_write_TuxDroid(data, TUX_SEND_LENGTH);
 }
 
 /**

Modified: daemon/trunk/libs/USBDaemon_usb.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb.c	2007-06-23 16:53:35 UTC (rev 416)
+++ daemon/trunk/libs/USBDaemon_usb.c	2007-06-23 17:02:52 UTC (rev 417)
@@ -175,7 +175,7 @@
  *
  * \return number of bytes written if successful, < 0 otherwise
  */
-int usb_writebytes_TuxDroid(const void *buf, size_t size)
+int usb_write_TuxDroid(const void *buf, size_t size)
 {
     return usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char *)buf, size,
                                TUX_WRITE_TIMEOUT);
@@ -187,7 +187,7 @@
  * @param[out] buf   Buffer to store data in
  * @param[in]  size  Size of buffer
  */
-int usb_readbytes_TuxDroid(void *buf, size_t size)
+int usb_read_TuxDroid(void *buf, size_t size)
 {
     return usb_interrupt_read(tux_handle, TUX_READ_EP, (char *)buf, size,
                               TUX_READ_TIMEOUT);
@@ -211,11 +211,11 @@
     if (usb_connection_status != USB_CONNECTED)
         return;
 
-    idx = usb_writebytes_TuxDroid(cmd_send, sizeof(cmd_send));
+    idx = usb_write_TuxDroid(cmd_send, sizeof(cmd_send));
     if (idx <= 0)
         return;
 
-    idx = usb_readbytes_TuxDroid(data, sizeof(data));
+    idx = usb_read_TuxDroid(data, sizeof(data));
     if (idx <= 0)
         return;
 
@@ -250,7 +250,7 @@
  *
  * @return Acknowledgement (ACK_xxx), may be success or error
  */
-unsigned char usb_write_TuxDroid(unsigned char data[TUX_SEND_LENGTH])
+unsigned char usb_send_TuxDroid(unsigned char data[TUX_SEND_LENGTH])
 {
     unsigned char counter;
     unsigned char csf;
@@ -260,7 +260,7 @@
 
     /* Send data */
     cmd_status_flag = 1;
-    usb_writebytes_TuxDroid(data, TUX_SEND_LENGTH);
+    usb_write_TuxDroid(data, TUX_SEND_LENGTH);
     counter = 0;
     csf = cmd_status_flag;
 

Modified: daemon/trunk/libs/USBDaemon_usb.h
===================================================================
--- daemon/trunk/libs/USBDaemon_usb.h	2007-06-23 16:53:35 UTC (rev 416)
+++ daemon/trunk/libs/USBDaemon_usb.h	2007-06-23 17:02:52 UTC (rev 417)
@@ -71,10 +71,10 @@
 extern int usb_capture_TuxDroid(void);
 extern void usb_release_TuxDroid(void);
 
-extern int usb_writebytes_TuxDroid(const void *buf, size_t size);
-extern int usb_readbytes_TuxDroid(void *buf, size_t size);
+extern int usb_write_TuxDroid(const void *buf, size_t size);
+extern int usb_read_TuxDroid(void *buf, size_t size);
 
 extern void usb_get_status_TuxDroid(void);
-extern unsigned char usb_write_TuxDroid(unsigned char datas[]);
+extern unsigned char usb_send_TuxDroid(unsigned char datas[]);
 
 #endif /* __USBDAEMON_USB_H__ */