summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-01-10 23:11:57 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-01-10 23:11:57 +0000
commit54da924e43c75235d32c0f2c6d0fcb1028105bd5 (patch)
tree847ce635b67a18148f1f98483f1c9f281825f68d /bootloader
parentbefd0ac3a61b70a86ee909ebb9dd59e074a9f9e8 (diff)
downloadrockbox-54da924e43c75235d32c0f2c6d0fcb1028105bd5.tar.gz
rockbox-54da924e43c75235d32c0f2c6d0fcb1028105bd5.tar.bz2
rockbox-54da924e43c75235d32c0f2c6d0fcb1028105bd5.zip
H300: Bootloader USB mode detection on EXTON wakeup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8326 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/main.c b/bootloader/main.c
index 482abddc8a..40f7a0510d 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -175,7 +175,7 @@ void main(void)
power_init();
/* Turn off if neither ON button is pressed */
- if(!(on_button || rc_on_button))
+ if(!(on_button || rc_on_button || usb_detect()))
power_off();
/* Backlight ON */
@@ -243,8 +243,8 @@ void main(void)
/* Don't start if the Hold button is active on the device you
are starting with */
- if((on_button && button_hold()) ||
- (rc_on_button && remote_button_hold())) {
+ if(!usb_detect() && ((on_button && button_hold()) ||
+ (rc_on_button && remote_button_hold()))) {
lcd_puts(0, 8, "HOLD switch on, power off...");
lcd_update();
sleep(HZ*2);