[tuxdroid-svn] r1162 - firmware/fuxusb/trunk/src

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

Author: Paul_R
Date: 2008-05-16 10:11:55 +0200 (Fri, 16 May 2008)
New Revision: 1162

Modified:
   firmware/fuxusb/trunk/src/usb_commands.c
Log:
* Moved the versionning from the tux commands to dongle commands.
  The commands for Tux don't need to be parsed anymore.


Modified: firmware/fuxusb/trunk/src/usb_commands.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_commands.c	2008-05-16 08:04:34 UTC (rev 1161)
+++ firmware/fuxusb/trunk/src/usb_commands.c	2008-05-16 08:11:55 UTC (rev 1162)
@@ -34,12 +34,9 @@
 
 /* Statics defs */
 static void dongle_cmd_parser(void);
-static void tux_cmd_parser(void);
 static void jump_bootloader(void);
 static void reset_dongle(void);
 
-
-
 /**
  * \brief Parse the received command
  */
@@ -71,7 +68,10 @@
         /* Commands for Tux */
         case TUX_CMD_HDR:
             new_cmd_enabled = False;
-            tux_cmd_parser();
+            new_command_received = True;
+            /* Transfert commands from command_received buffer to rf_commands. */                            
+            for(i=0;i < 4;i++)
+                rf_commands[i] = command_received[i];
             break;
         /* Bootloader commands */
         case BOOTLOADER_CMD_HDR:
@@ -111,7 +111,7 @@
         }            
     } 
     /* TTS commands */
-    if (command_received[0] == TTS_CMD)
+    else if (command_received[0] == TTS_CMD)
     {
         switch (command_received[1])
         {
@@ -124,6 +124,30 @@
             break;
         }
     }
+    /* Dongle version command */
+    else if (command_received[0] == INFO_FUXUSB_CMD)
+    {
+        FIFO_STT_flush();
+        /* Version */
+        FIFO_STT_put(info_version.version_cmd);
+        FIFO_STT_put(info_version.cpu_ver_maj);
+        FIFO_STT_put(info_version.ver_minor);
+        FIFO_STT_put(info_version.ver_update);
+
+        /* Revision */
+        FIFO_STT_put(info_revision.revision_cmd);
+        FIFO_STT_put((info_revision.revision&0xFF00)>>8);
+        FIFO_STT_put((info_revision.revision&0x00FF));
+        FIFO_STT_put(info_revision.release_type);
+
+        /* Author */
+        FIFO_STT_put(info_author.author_cmd);
+        FIFO_STT_put((info_author.author_id&0xFF00)>>8);
+        FIFO_STT_put((info_author.author_id&0x00FF));
+        FIFO_STT_put(info_author.variation);
+
+        status_requested = True;
+    }
 }
 
 /**
@@ -192,49 +216,7 @@
     send_status();
 }
 
-
 /**
- * Parse generic tux commands and process those addressed to the dongle.
- */
-static void tux_cmd_parser(void)
-{
-    uint8_t i = 0;
-
-    new_command_received = True;
-    /* Transfert commands from command_received buffer to rf_commands. */                            
-    for(i=0;i < 4;i++)
-        rf_commands[i] = command_received[i];
-#ifdef VERSION
-    // XXX This routine should be moved from here to the dongle_cmd_parser.
-    if (rf_commands[0] == INFO_FUXUSB_CMD)
-    {
-        /* Version */
-        FIFO_STT_put(info_version.version_cmd);
-        FIFO_STT_put(info_version.cpu_ver_maj);
-        FIFO_STT_put(info_version.ver_minor);
-        FIFO_STT_put(info_version.ver_update);
-
-        /* Revision */
-        FIFO_STT_put(info_revision.revision_cmd);
-        FIFO_STT_put((info_revision.revision&0xFF00)>>8);
-        FIFO_STT_put((info_revision.revision&0x00FF));
-        FIFO_STT_put(info_revision.release_type);
-
-        /* Author */
-        FIFO_STT_put(info_author.author_cmd);
-        FIFO_STT_put((info_author.author_id&0xFF00)>>8);
-        FIFO_STT_put((info_author.author_id&0x00FF));
-        FIFO_STT_put(info_author.variation);
-
-        /* This command is not for the RF. Reset the flag */
-        new_command_received = False;
-        new_cmd_enabled = True;
-    }
-    // End XXX.
-#endif
-}
-
-/**
  *\brief Perform a complete reset. 
  */
 static void reset_dongle(void)