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

2 files changed, 0 insertions, 2 deletions

diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 78f61f5cc7..66b7094760 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -92,7 +92,6 @@ static int handle_usb_events(void)
         switch(button)
         {
             case SYS_USB_DISCONNECTED:
-                usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
                 return 1;
             case SYS_CHARGER_DISCONNECTED:
                 /*reset rockbox battery runtime*/
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 3f90a72b3e..044db9ff1f 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -426,7 +426,6 @@ static void thread(void)
                 break;
             case SYS_USB_DISCONNECTED:
                 in_usb_mode = false;
-                rb->usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
                 break;
             case SYS_POWEROFF:
                 exit_reason = "power off";