diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-02-11 09:02:46 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-02-11 09:02:46 +0000 |
commit | d4ad14c2b030795801a4bbf3b8d14a04546c91fa (patch) | |
tree | e76f1dd33e5f69d2aefac8f078c2c375c419ee5c /bootloader/main.c | |
parent | 7999e75204986c053e187d5a5bfec307641e4b24 (diff) | |
download | rockbox-d4ad14c2b030795801a4bbf3b8d14a04546c91fa.tar.gz rockbox-d4ad14c2b030795801a4bbf3b8d14a04546c91fa.zip |
Correct check for BUTTON_RC_ON, reset cookie when Hold swicth is on
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5899 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/main.c')
-rw-r--r-- | bootloader/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bootloader/main.c b/bootloader/main.c index 8ca44e8c47..0cad6ff208 100644 --- a/bootloader/main.c +++ b/bootloader/main.c | |||
@@ -143,7 +143,7 @@ void main(void) | |||
143 | sleep(HZ/50); /* Allow the button driver to check the buttons */ | 143 | sleep(HZ/50); /* Allow the button driver to check the buttons */ |
144 | 144 | ||
145 | if(button_status() & BUTTON_REC || | 145 | if(button_status() & BUTTON_REC || |
146 | button_status() & BUTTON_RC_ON) { | 146 | (button_status() & BUTTON_RC_ON) == BUTTON_RC_ON) { |
147 | lcd_puts(0, 8, "Starting original firmware..."); | 147 | lcd_puts(0, 8, "Starting original firmware..."); |
148 | lcd_update(); | 148 | lcd_update(); |
149 | start_iriver_fw(); | 149 | start_iriver_fw(); |
@@ -153,6 +153,9 @@ void main(void) | |||
153 | lcd_puts(0, 8, "HOLD switch on, power off..."); | 153 | lcd_puts(0, 8, "HOLD switch on, power off..."); |
154 | lcd_update(); | 154 | lcd_update(); |
155 | sleep(HZ/2); | 155 | sleep(HZ/2); |
156 | /* Reset the cookie for the crt0 crash check */ | ||
157 | asm(" move.l #0,%d0"); | ||
158 | asm(" move.l %d0,0x10017ffc"); | ||
156 | power_off(); | 159 | power_off(); |
157 | } | 160 | } |
158 | #if 0 | 161 | #if 0 |