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

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

Author: neimad
Date: 2007-06-09 19:50:17 +0200 (Sat, 09 Jun 2007)
New Revision: 361

Modified:
   daemon/trunk/libs/USBDaemon_command_tux.c
   daemon/trunk/libs/USBDaemon_command_tux.h
Log:
* Made a bunch of functions static, as they are only used
  where they're defined.

  The functions here should be reordered so that the added
  prototypes can be removed.


Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c	2007-06-09 16:33:58 UTC (rev 360)
+++ daemon/trunk/libs/USBDaemon_command_tux.c	2007-06-09 17:50:17 UTC (rev 361)
@@ -53,6 +53,23 @@
 int avoid_wifi_channel(unsigned char wifi_channel);
 int random_tux_connection(void);
 
+static void sub_daemon_cmd_struct(unsigned char const data[],
+                                  unsigned char result[],
+                                  int const id_client);
+
+static void sub_daemon_req_info(unsigned char const data[],
+                                unsigned char result[],
+                                int const id_client);
+
+static void tux_cmd_raw(unsigned char const data[], unsigned char result[]);
+static void tux_cmd_struct(unsigned char const data[], unsigned char result[]);
+static void tux_req_status(unsigned char const data[], unsigned char result[]);
+static void tux_req_info(unsigned char const data[], unsigned char result[]);
+
+static unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1,
+                                      unsigned char param2,
+                                      unsigned char param3);
+
 /************************************************************************** */
 /* COMMANDS FROM CLIENTS DISPATCHER */
 /************************************************************************** */
@@ -254,8 +271,8 @@
 /******************************************************************** */
 /* sub_daemon_cmd_struct() */
 /******************************************************************** */
-void sub_daemon_cmd_struct(unsigned char const data[], unsigned char result[],
-                           int const id_client)
+static void sub_daemon_cmd_struct(unsigned char const data[],
+                                  unsigned char result[], int const id_client)
 {
     switch (data[0])
     {
@@ -297,8 +314,8 @@
 /************************************************************************ */
 /* sub_daemon_req_info() */
 /************************************************************************ */
-void sub_daemon_req_info(unsigned char const data[], unsigned char result[],
-                         int const id_client)
+static void sub_daemon_req_info(unsigned char const data[],
+                                unsigned char result[], int const id_client)
 {
     unsigned char i;
 
@@ -334,7 +351,7 @@
 /************************************************************************ */
 /* tux_cmd_raw() */
 /************************************************************************ */
-void tux_cmd_raw(unsigned char const data[], unsigned char result[])
+static void tux_cmd_raw(unsigned char const data[], unsigned char result[])
 {
     unsigned char usb_send[5];
     unsigned char i;
@@ -348,7 +365,7 @@
 /************************************************************************ */
 /* tux_cmd_struct() */
 /************************************************************************ */
-void tux_cmd_struct(unsigned char const data[], unsigned char result[])
+static void tux_cmd_struct(unsigned char const data[], unsigned char result[])
 {
     unsigned char ACK;
 
@@ -522,7 +539,7 @@
 /************************************************************************ */
 /* tux_req_status() */
 /************************************************************************ */
-void tux_req_status(unsigned char const data[], unsigned char result[])
+static void tux_req_status(unsigned char const data[], unsigned char result[])
 {
     result[0] = data[0];
     switch (data[0])
@@ -879,7 +896,7 @@
 /************************************************************************ */
 /* tux_req_info() */
 /************************************************************************ */
-void tux_req_info(unsigned char const data[], unsigned char result[])
+static void tux_req_info(unsigned char const data[], unsigned char result[])
 {
     result[0] = data[0];
 
@@ -960,7 +977,7 @@
 
 /**
  * Connect to a tux by its ID
- * 
+ *
  * The return value only tells whether the command has been sent successfully
  * to the dongle. That does by no means tell anything about the actual RF
  * connection with tux. Check RF_status for this.
@@ -1167,7 +1184,7 @@
         {2, 26, 32, 38, 43, 49, 55, 61, 67, 72, 78, 84, 90, 92, 92};
 
     if (send_usb_dongle_cmd(USB_TUX_CONNECTION_CMD,
-            USB_TUX_CONNECTION_CHANGE_ID, lower_ATR_channel[wifi_channel], 
+            USB_TUX_CONNECTION_CHANGE_ID, lower_ATR_channel[wifi_channel],
             higher_ATR_channel[wifi_channel]) == USB_FRAME_SIZE)
         return 0;
     else

Modified: daemon/trunk/libs/USBDaemon_command_tux.h
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.h	2007-06-09 16:33:58 UTC (rev 360)
+++ daemon/trunk/libs/USBDaemon_command_tux.h	2007-06-09 17:50:17 UTC (rev 361)
@@ -35,19 +35,8 @@
 /* COMMANDS FROM CLIENTS DISPATCHER */
 extern void commands_dispatcher(unsigned char client_id,
                                 unsigned char src_frame[16]);
-extern void sub_daemon_cmd_struct(unsigned char const data[],
-                                  unsigned char result[], int const id_client);
-extern void sub_daemon_req_info(unsigned char const data[],
-                                unsigned char result[], int const id_client);
-extern void tux_cmd_raw(unsigned char const data[], unsigned char result[]);
-extern void tux_cmd_struct(unsigned char const data[], unsigned char result[]);
-extern void tux_req_status(unsigned char const data[], unsigned char result[]);
-extern void tux_req_info(unsigned char const data[], unsigned char result[]);
 
 /* TUX PHYSICAL CHANGES */
-extern unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1,
-                                      unsigned char param2,
-                                      unsigned char param3);
 extern unsigned char send_usb_dongle_cmd(usb_dongle_commands_t cmd,
                                          unsigned char param1,
                                          unsigned char param2,