summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorSzymon Dziok <b0hoon@o2.pl>2010-10-21 21:16:00 +0000
committerSzymon Dziok <b0hoon@o2.pl>2010-10-21 21:16:00 +0000
commit93ac9868670f3005813c7443988a612c8bab96e3 (patch)
treea73417dc54c6d63ccf3c53574ada9623a75546e6 /firmware
parentf81c0c05ce4c522ef7a59244c9e7dc1e3002d4fe (diff)
downloadrockbox-93ac9868670f3005813c7443988a612c8bab96e3.tar.gz
rockbox-93ac9868670f3005813c7443988a612c8bab96e3.tar.bz2
rockbox-93ac9868670f3005813c7443988a612c8bab96e3.zip
HDD6330: fix loading of the OF through the Rockbox bootloader (correct magic values in registers at the start), fix bootloader warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28322 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/crt0-pp-bl.S10
-rw-r--r--firmware/target/arm/philips/hdd6330/button-hdd6330.c3
2 files changed, 11 insertions, 2 deletions
diff --git a/firmware/target/arm/crt0-pp-bl.S b/firmware/target/arm/crt0-pp-bl.S
index 79235a6371..d1d9182314 100644
--- a/firmware/target/arm/crt0-pp-bl.S
+++ b/firmware/target/arm/crt0-pp-bl.S
@@ -156,7 +156,7 @@ cpu:
mov r1, #WAKE
str r1, [r0]
-#if defined(SANSA_C200) || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330)
+#if defined(SANSA_C200) || defined(PHILIPS_HDD1630)
/* Magic for loading the c200 OF */
ldr r0, =0xb00d10ad
mov r1, #0x700
@@ -164,6 +164,14 @@ cpu:
mov r3, #0x7
#endif
+#if defined(PHILIPS_HDD6330)
+ /* Magic for loading the HDD6XX0 OF */
+ ldr r0, =0xb00d10ad
+ mov r1, #0x800
+ ldr r2, =0xfff0
+ mov r3, #0x7
+#endif
+
ldr r4, =startup_loc
ldr pc, [r4]
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
index 1d15b11a1e..fc171c72ba 100644
--- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
@@ -29,9 +29,10 @@
#include "logf.h"
static int int_btn = BUTTON_NONE;
+#ifndef BOOTLOADER
static int old_pos = -1;
-
static int scroll_repeat = BUTTON_NONE;
+#endif
static int repeat = 0;
/*