diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-01-10 23:11:57 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-01-10 23:11:57 +0000 |
| commit | 54da924e43c75235d32c0f2c6d0fcb1028105bd5 (patch) | |
| tree | 847ce635b67a18148f1f98483f1c9f281825f68d /bootloader | |
| parent | befd0ac3a61b70a86ee909ebb9dd59e074a9f9e8 (diff) | |
| download | rockbox-54da924e43c75235d32c0f2c6d0fcb1028105bd5.tar.gz 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.c | 6 |
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) | |||
| 175 | power_init(); | 175 | power_init(); |
| 176 | 176 | ||
| 177 | /* Turn off if neither ON button is pressed */ | 177 | /* Turn off if neither ON button is pressed */ |
| 178 | if(!(on_button || rc_on_button)) | 178 | if(!(on_button || rc_on_button || usb_detect())) |
| 179 | power_off(); | 179 | power_off(); |
| 180 | 180 | ||
| 181 | /* Backlight ON */ | 181 | /* Backlight ON */ |
| @@ -243,8 +243,8 @@ void main(void) | |||
| 243 | 243 | ||
| 244 | /* Don't start if the Hold button is active on the device you | 244 | /* Don't start if the Hold button is active on the device you |
| 245 | are starting with */ | 245 | are starting with */ |
| 246 | if((on_button && button_hold()) || | 246 | if(!usb_detect() && ((on_button && button_hold()) || |
| 247 | (rc_on_button && remote_button_hold())) { | 247 | (rc_on_button && remote_button_hold()))) { |
| 248 | lcd_puts(0, 8, "HOLD switch on, power off..."); | 248 | lcd_puts(0, 8, "HOLD switch on, power off..."); |
| 249 | lcd_update(); | 249 | lcd_update(); |
| 250 | sleep(HZ*2); | 250 | sleep(HZ*2); |