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

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

Author: neimad
Date: 2007-06-03 18:19:41 +0200 (Sun, 03 Jun 2007)
New Revision: 343

Modified:
   daemon/trunk/libs/USBDaemon_status_table.c
   daemon/trunk/libs/USBDaemon_status_table.h
   daemon/trunk/libs/USBDaemon_usb_readWrite.c
Log:
* Removed global variable NUMBER_frames.

  Passing this information from update_system_status_table()
  to usb_get_status_TuxDroid() this way, as a global side-
  effect, was ugly. Besides, the information is available to
  usb_get_status_TuxDroid() from the start, as it is part of
  array cmd_dispatch[] !



Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c	2007-06-03 15:44:52 UTC (rev 342)
+++ daemon/trunk/libs/USBDaemon_status_table.c	2007-06-03 16:19:41 UTC (rev 343)
@@ -39,7 +39,6 @@
 unsigned char DONGLE_status = 0;
 unsigned char RF_status = 0;
 unsigned char CMD_status = 0;
-unsigned char NUMBER_frames = 0;
 unsigned char pong_received;
 unsigned char cmd_status_flag;
 unsigned char pong_received;
@@ -174,8 +173,6 @@
         if (CMD_status == 2 || CMD_status == 3)
             cmd_status_flag = 0;
     }
-
-    NUMBER_frames = new_status[3];
 }
 
 /************************************************************************ */

Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h	2007-06-03 15:44:52 UTC (rev 342)
+++ daemon/trunk/libs/USBDaemon_status_table.h	2007-06-03 16:19:41 UTC (rev 343)
@@ -229,7 +229,6 @@
 
 extern unsigned char RF_status;
 extern unsigned char CMD_status;
-extern unsigned char NUMBER_frames;
 extern unsigned char cmd_status_flag;
 extern unsigned char pong_received;
 

Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-06-03 15:44:52 UTC (rev 342)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-06-03 16:19:41 UTC (rev 343)
@@ -69,6 +69,7 @@
     const unsigned char cmd_send[5] = { 0x01, 0x01, 0x00, 0x00, 0x00 };
     unsigned char data[64];
     unsigned char cmd_dispatch[5];
+    unsigned char num_frames;
     int idx;
     unsigned char i;
 
@@ -94,13 +95,16 @@
     cmd_dispatch[3] = data[3];
 
     update_system_status_table(cmd_dispatch);
+
+    num_frames = cmd_dispatch[3];
+
     if (show_frames)
         log_debug("RF_st: %.2x CMD_st: %.2x NB_frames : %d idx : %d",
-                  RF_status, CMD_status, NUMBER_frames, idx);
+                  RF_status, CMD_status, num_frames, idx);
 
-    if (NUMBER_frames > 0 && NUMBER_frames < 16)
+    if (num_frames > 0 && num_frames < 16)
     {
-        for (i = 0; i < NUMBER_frames; i++)
+        for (i = 0; i < num_frames; i++)
         {
             cmd_dispatch[0] = data[(i + 1) * 4 + 0];
             cmd_dispatch[1] = data[(i + 1) * 4 + 1];