summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-07-08 15:36:12 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-07-08 15:36:12 +0000
commita39026ac5e6e9e5abeda32c1f98fa832ac0e7814 (patch)
tree887022ae9d18209647b277737286240c05dc80e8
parente82df4e5970fbf970f471db81df56cc55d977a7c (diff)
downloadrockbox-a39026ac5e6e9e5abeda32c1f98fa832ac0e7814.tar.gz
rockbox-a39026ac5e6e9e5abeda32c1f98fa832ac0e7814.tar.bz2
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.c13
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)
sleep(HZ/50); /* Allow the button driver to check the buttons */
- if(button_status() & BUTTON_REC || rc_on_button) {
+ if(button_status() & BUTTON_REC) {
lcd_puts(0, 8, "Starting original firmware...");
lcd_update();
start_iriver_fw();
}
- if(on_button & button_hold()) {
+ if(on_button & button_hold() ||
+ rc_on_button & remote_button_hold()) {
lcd_puts(0, 8, "HOLD switch on, power off...");
lcd_update();
sleep(HZ*2);
@@ -217,14 +218,6 @@ void main(void)
asm(" move.l %d0,0x10017ffc");
power_off();
}
-#if 0
- if((button_status() & BUTTON_RC_ON) & remote_button_hold()) {
- lcd_puts(0, 8, "HOLD switch on, power off...");
- lcd_update();
- sleep(HZ/2);
- power_off();
- }
-#endif
rc = ata_init();
if(rc)