summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-11-19 01:33:28 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-11-19 01:33:28 +0000
commitbbe919bdcb1f0f4339c46c0f5f405bf1378b9408 (patch)
tree5916df5eaf99f4acdb4bba0a3c2a0462d7b833c3 /bootloader
parentd5f3e9ba83c8f3af22997791099ac68b1bd0db16 (diff)
downloadrockbox-bbe919bdcb1f0f4339c46c0f5f405bf1378b9408.tar.gz
rockbox-bbe919bdcb1f0f4339c46c0f5f405bf1378b9408.tar.bz2
rockbox-bbe919bdcb1f0f4339c46c0f5f405bf1378b9408.zip
iriver bootloader: Better handling of the Hold buttons, turn on the remote backlight when booting, look for /.rockbox/rockbox.iriver before trying /rockbox.iriver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7976 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/main.c42
1 files changed, 36 insertions, 6 deletions
diff --git a/bootloader/main.c b/bootloader/main.c
index 5e981aa7fa..b0d25cc42f 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -97,9 +97,13 @@ int load_firmware(void)
unsigned char *buf = (unsigned char *)DRAM_START;
char str[80];
- fd = open("/rockbox.iriver", O_RDONLY);
+ fd = open("/.rockbox/" BOOTFILE, O_RDONLY);
if(fd < 0)
- return -1;
+ {
+ fd = open("/" BOOTFILE, O_RDONLY);
+ if(fd < 0)
+ return -1;
+ }
len = filesize(fd) - 8;
@@ -190,15 +194,32 @@ void main(void)
if ((data & 0x40) == 0)
rc_on_button = true;
- /* Backlight ON */
- or_l(0x00020000, &GPIO1_ENABLE);
- or_l(0x00020000, &GPIO1_FUNCTION);
-
/* Set the default state of the hard drive power to OFF */
ide_power_enable(false);
power_init();
+ /* Turn off if neither ON button is pressed */
+ if(!(on_button || rc_on_button))
+ power_off();
+
+ /* Backlight ON */
+ or_l(0x00020000, &GPIO1_ENABLE);
+ or_l(0x00020000, &GPIO1_FUNCTION);
+ and_l(~0x00020000, &GPIO1_OUT);
+
+ /* Remote backlight ON */
+#ifdef HAVE_REMOTE_LCD
+#ifdef IRIVER_H300_SERIES
+ or_l(0x00000002, &GPIO1_ENABLE);
+ and_l(~0x00000002, &GPIO1_OUT);
+#else
+ or_l(0x00000800, &GPIO_ENABLE);
+ or_l(0x00000800, &GPIO_FUNCTION);
+ and_l(~0x00000800, &GPIO_OUT);
+#endif
+#endif
+
/* Power on the hard drive early, to speed up the loading */
if(!((on_button && button_hold()) ||
(rc_on_button && remote_button_hold()))) {
@@ -246,6 +267,15 @@ void main(void)
lcd_puts(0, 8, "HOLD switch on, power off...");
lcd_update();
sleep(HZ*2);
+
+ /* Backlight OFF */
+#ifdef HAVE_REMOTE_LCD
+#ifdef IRIVER_H300_SERIES
+ or_l(0x00000002, &GPIO1_OUT);
+#else
+ or_l(0x00000800, &GPIO_OUT);
+#endif
+#endif
/* Reset the cookie for the crt0 crash check */
asm(" move.l #0,%d0");
asm(" move.l %d0,0x10017ffc");