summaryrefslogtreecommitdiffstats
path: root/bootloader
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 /bootloader
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 'bootloader')
-rw-r--r--bootloader/common.c2
-rw-r--r--bootloader/gigabeat-s.c3
-rw-r--r--bootloader/ondavx747.c3
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;
- }
}
}
}