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

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

Author: Paul_R
Date: 2008-05-15 15:15:44 +0200 (Thu, 15 May 2008)
New Revision: 1152

Modified:
   firmware/fuxusb/trunk/src/usb_enum.c
Log:
* Created a function stall_request to replace each inline requests.


Modified: firmware/fuxusb/trunk/src/usb_enum.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_enum.c	2008-05-15 08:57:03 UTC (rev 1151)
+++ firmware/fuxusb/trunk/src/usb_enum.c	2008-05-15 13:15:44 UTC (rev 1152)
@@ -23,6 +23,7 @@
 #include "global.h"
 #include "version.h"
 #include "usb_enum.h"
+#include "usb_ep.h"
 #include "spi_task.h"
 #include "fifo_stt.h"
 
@@ -651,6 +652,7 @@
 static void usb_hid_set_idle(void);
 static void usb_hid_get_idle(void);
 
+static void stall_request(void);
 /*F**************************************************************************
  * NAME: usb_var_init
  *----------------------------------------------------------------------------
@@ -816,10 +818,7 @@
             printf("Unknown Request ");
 #endif 
             Usb_clear_rx_setup();
-            Usb_set_stall_request();
-            while (!Usb_stall_sent());
-            Usb_clear_stall_request();
-            Usb_clear_stalled();
+            stall_request();
             break;
         }
     }
@@ -854,10 +853,7 @@
             printf("Unknown Request ");
 #endif 
             Usb_clear_rx_setup();
-            Usb_set_stall_request();
-            while (!Usb_stall_sent());
-            Usb_clear_stall_request();
-            Usb_clear_stalled();
+            stall_request();
             break;
         }
 
@@ -868,10 +864,7 @@
         printf("Unknown Request ");
 #endif 
         Usb_clear_rx_setup();
-        Usb_set_stall_request();
-        while (!Usb_stall_sent());
-        Usb_clear_stall_request();
-        Usb_clear_stalled();
+        stall_request();
     }
 
 #ifdef USB_ENUM_DEBUG
@@ -969,10 +962,7 @@
     }
     else
     {
-        Usb_set_stall_request();
-        while (!Usb_stall_sent());
-        Usb_clear_stall_request();
-        Usb_clear_stalled();
+        stall_request();
         return;
     }
 
@@ -1180,10 +1170,7 @@
                     printf("UNKNOWN_STRING_INDEX ");
 #endif
                     Usb_clear_rx_setup();
-                    Usb_set_stall_request(); 
-                    while ((!(Usb_stall_sent())) && (Usb_setup_received()));
-                    Usb_clear_stalled();
-                    Usb_clear_stall_request();
+                    stall_request();
                     Usb_clear_DIR();
                     return;
                 }
@@ -1196,10 +1183,7 @@
             printf("UNKNOWN");
 #endif
             Usb_clear_rx_setup();
-            Usb_set_stall_request();
-            while ((!(Usb_stall_sent())) && (Usb_setup_received()));
-            Usb_clear_stalled();
-            Usb_clear_stall_request();
+            stall_request();
             Usb_clear_DIR();
 #ifdef USB_ENUM_DEBUG
             printf("1");
@@ -1583,10 +1567,7 @@
 {
     Usb_clear_rx_setup();
     Usb_set_DIR();
-    Usb_set_stall_request();
-    while (!Usb_stall_sent());
-    Usb_clear_stall_request();
-    Usb_clear_stalled();
+    stall_request();
     Usb_clear_DIR();
 }
 
@@ -1663,16 +1644,12 @@
     if (bmRequestType == ZERO_TYPE)
     {
         Usb_clear_rx_setup();
-        Usb_set_stall_request();
-        while (!(Usb_stall_sent()));
-        Usb_clear_stall_request();
+        stall_request();
     }
     if (bmRequestType == INTERFACE_TYPE)
     {
         Usb_clear_rx_setup();
-        Usb_set_stall_request();
-        while (!(Usb_stall_sent()));
-        Usb_clear_stall_request();
+        stall_request();
     }
     if (bmRequestType == ENDPOINT_TYPE)
     {
@@ -1696,10 +1673,7 @@
             default:
                 {
                     Usb_clear_rx_setup();
-                    Usb_set_stall_request();
-                    while (!(Usb_stall_sent()));
-                    Usb_clear_stall_request();
-                    Usb_clear_stalled();
+                    stall_request();
                     break;
                 }
             }
@@ -1729,16 +1703,12 @@
     if (bmRequestType == ZERO_TYPE)
     {
         Usb_clear_rx_setup();
-        Usb_set_stall_request();
-        while (!(Usb_stall_sent()));
-        Usb_clear_stall_request();
+        stall_request();
     }
     if (bmRequestType == INTERFACE_TYPE)
     {
         Usb_clear_rx_setup();
-        Usb_set_stall_request();
-        while (!(Usb_stall_sent()));
-        Usb_clear_stall_request();
+        stall_request();
     }
     if (bmRequestType == ENDPOINT_TYPE)
     {
@@ -1771,9 +1741,7 @@
             default:
                 {
                     Usb_clear_rx_setup();
-                    Usb_set_stall_request();
-                    while (!(Usb_stall_sent()));
-                    Usb_clear_stall_request();
+                    stall_request();
                     break;
                 }
             }
@@ -1867,3 +1835,10 @@
     Usb_clear_DIR();
 }
 
+static void stall_request(void)
+{
+    Usb_set_stall_request();
+    while (!(Usb_stall_sent()));
+    Usb_clear_stall_request();
+    Usb_clear_stalled();
+}