diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-07-08 15:36:12 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-07-08 15:36:12 +0000 |
commit | a39026ac5e6e9e5abeda32c1f98fa832ac0e7814 (patch) | |
tree | 887022ae9d18209647b277737286240c05dc80e8 | |
parent | e82df4e5970fbf970f471db81df56cc55d977a7c (diff) | |
download | rockbox-a39026ac5e6e9e5abeda32c1f98fa832ac0e7814.tar.gz rockbox-a39026ac5e6e9e5abeda32c1f98fa832ac0e7814.zip |
Removed the start-original-with-remote bootloader feature
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7073 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | bootloader/main.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/bootloader/main.c b/bootloader/main.c index 736b0a6f5f..e7e61665fd 100644 --- a/bootloader/main.c +++ b/bootloader/main.c | |||
@@ -202,13 +202,14 @@ void main(void) | |||
202 | 202 | ||
203 | sleep(HZ/50); /* Allow the button driver to check the buttons */ | 203 | sleep(HZ/50); /* Allow the button driver to check the buttons */ |
204 | 204 | ||
205 | if(button_status() & BUTTON_REC || rc_on_button) { | 205 | if(button_status() & BUTTON_REC) { |
206 | lcd_puts(0, 8, "Starting original firmware..."); | 206 | lcd_puts(0, 8, "Starting original firmware..."); |
207 | lcd_update(); | 207 | lcd_update(); |
208 | start_iriver_fw(); | 208 | start_iriver_fw(); |
209 | } | 209 | } |
210 | 210 | ||
211 | if(on_button & button_hold()) { | 211 | if(on_button & button_hold() || |
212 | rc_on_button & remote_button_hold()) { | ||
212 | lcd_puts(0, 8, "HOLD switch on, power off..."); | 213 | lcd_puts(0, 8, "HOLD switch on, power off..."); |
213 | lcd_update(); | 214 | lcd_update(); |
214 | sleep(HZ*2); | 215 | sleep(HZ*2); |
@@ -217,14 +218,6 @@ void main(void) | |||
217 | asm(" move.l %d0,0x10017ffc"); | 218 | asm(" move.l %d0,0x10017ffc"); |
218 | power_off(); | 219 | power_off(); |
219 | } | 220 | } |
220 | #if 0 | ||
221 | if((button_status() & BUTTON_RC_ON) & remote_button_hold()) { | ||
222 | lcd_puts(0, 8, "HOLD switch on, power off..."); | ||
223 | lcd_update(); | ||
224 | sleep(HZ/2); | ||
225 | power_off(); | ||
226 | } | ||
227 | #endif | ||
228 | 221 | ||
229 | rc = ata_init(); | 222 | rc = ata_init(); |
230 | if(rc) | 223 | if(rc) |