summaryrefslogtreecommitdiffstats
path: root/bootloader/iriver_h300.c
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2007-03-07 11:52:17 +0000
committerSteve Bavin <pondlife@pondlife.me>2007-03-07 11:52:17 +0000
commit88f249d807416162e21caeff4bfa22e0bc1e7ed6 (patch)
tree15a38f2d41b2c3b3237bf4486cceb1d2a3d4e00b /bootloader/iriver_h300.c
parent5eb29674283cb1923a26be2336bd9bed55be26ae (diff)
downloadrockbox-88f249d807416162e21caeff4bfa22e0bc1e7ed6.tar.gz
rockbox-88f249d807416162e21caeff4bfa22e0bc1e7ed6.tar.bz2
rockbox-88f249d807416162e21caeff4bfa22e0bc1e7ed6.zip
Allow H300 to be started up from a non-LCD remote
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12668 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/iriver_h300.c')
-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)
adc_init();
button_init();
- if ((on_button && button_hold()) ||
- (rc_on_button && remote_button_hold()))
- {
- hold_status = true;
- }
-
backlight_init();
lcd_init();
@@ -218,9 +212,17 @@ void main(void)
check_battery();
+ if(rtc_alarm)
+ printf("RTC alarm detected");
+
/* Don't start if the Hold button is active on the device you
are starting with */
- if (!usb_detect() && !charger_inserted() && hold_status)
+ if ((on_button && button_hold()) ||
+ (rc_on_button && remote_button_hold()))
+ {
+ hold_status = true;
+ }
+ if (hold_status && !rtc_alarm && !usb_detect() && !charger_inserted())
{
if (detect_original_firmware())
{
@@ -229,9 +231,6 @@ void main(void)
}
}
- if(rtc_alarm)
- printf("RTC alarm detected");
-
/* Holding REC while starting runs the original firmware */
if (detect_original_firmware() && rec_button)
{