Try to get some control over #ifdef hell in usb.c by refactoring and inline function use. SYS_USB_DISCONNECTED_ACK hasn't been doing anything useful for the USB thread; remove it. USB thread simply ignores that value. Observe only valid usb_state transitions.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29084 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 1 insertions, 7 deletions

diff --git a/bootloader/common.c b/bootloader/common.c
index 1099b9f453..8c587edf51 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -303,7 +303,7 @@ void display_logf(void) /* Doesn't return! */
         if(button == SYS_USB_CONNECTED)
             usb_acknowledge(SYS_USB_CONNECTED_ACK);
         else if(button == SYS_USB_DISCONNECTED)
-            usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
+            ;
         else if(button & LOGF_UP)
             user_index++;
         else if(button & LOGF_DOWN)
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index c29265ddad..77887f5d4b 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -135,10 +135,7 @@ static void handle_usb(void)
         {
             button = button_get(true);
             if (button == SYS_USB_DISCONNECTED)
-            {
-                usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
                 break;
-            }
         }
     }
 
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index 2903b04252..42a6075bfc 100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -78,10 +78,7 @@ static void usb_mode(void)
         {
             button = button_get(true);
             if (button == SYS_USB_DISCONNECTED)
-            {
-                usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
                 break;
-            }
         }
     }
 }