summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-01-18 14:10:06 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-01-18 14:10:06 +0000
commit453550a6877afcda342ac2477cf05028fff053f9 (patch)
tree0c1da0af945d93a6c4af2da5eb359f737e6a7f53 /apps
parent980225c3e20b3102382c910da6e1406cc8c7f1b5 (diff)
downloadrockbox-453550a6877afcda342ac2477cf05028fff053f9.tar.gz
rockbox-453550a6877afcda342ac2477cf05028fff053f9.tar.bz2
rockbox-453550a6877afcda342ac2477cf05028fff053f9.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/usb_screen.c1
-rw-r--r--apps/plugins/battery_bench.c1
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";