summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bootloader/iriver_h300.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 00408cbb03..a25e3ae30b 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -195,12 +195,6 @@ void main(void)
195 adc_init(); 195 adc_init();
196 button_init(); 196 button_init();
197 197
198 if ((on_button && button_hold()) ||
199 (rc_on_button && remote_button_hold()))
200 {
201 hold_status = true;
202 }
203
204 backlight_init(); 198 backlight_init();
205 199
206 lcd_init(); 200 lcd_init();
@@ -218,9 +212,17 @@ void main(void)
218 212
219 check_battery(); 213 check_battery();
220 214
215 if(rtc_alarm)
216 printf("RTC alarm detected");
217
221 /* Don't start if the Hold button is active on the device you 218 /* Don't start if the Hold button is active on the device you
222 are starting with */ 219 are starting with */
223 if (!usb_detect() && !charger_inserted() && hold_status) 220 if ((on_button && button_hold()) ||
221 (rc_on_button && remote_button_hold()))
222 {
223 hold_status = true;
224 }
225 if (hold_status && !rtc_alarm && !usb_detect() && !charger_inserted())
224 { 226 {
225 if (detect_original_firmware()) 227 if (detect_original_firmware())
226 { 228 {
@@ -229,9 +231,6 @@ void main(void)
229 } 231 }
230 } 232 }
231 233
232 if(rtc_alarm)
233 printf("RTC alarm detected");
234
235 /* Holding REC while starting runs the original firmware */ 234 /* Holding REC while starting runs the original firmware */
236 if (detect_original_firmware() && rec_button) 235 if (detect_original_firmware() && rec_button)
237 { 236 {