summaryrefslogtreecommitdiffstats
path: root/bootloader/ipod.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-07-25 13:12:38 +0000
committerDave Chapman <dave@dchapman.com>2007-07-25 13:12:38 +0000
commitebc076bc15d6501674b9db772557a0eadfb4a5e2 (patch)
treea49e4460708d78c76ea25669afded36c3c631f04 /bootloader/ipod.c
parented095235d44a9427e76f05f9f6d35325ddf1d4d9 (diff)
downloadrockbox-ebc076bc15d6501674b9db772557a0eadfb4a5e2.tar.gz
rockbox-ebc076bc15d6501674b9db772557a0eadfb4a5e2.tar.bz2
rockbox-ebc076bc15d6501674b9db772557a0eadfb4a5e2.zip
Remove the hack which read the ipod hardware revision from flash in the bootloader and passed it to Rockbox via a fixed address in SDRAM. Rockbox now remaps flash and so can just read the value itself. Also clean up the debug menu a little - only display the hw revision for ipods, and add the lcd_type variable to indicate the type of LCD (0 or 1) for ipod Color/Photo.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13986 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/ipod.c')
-rw-r--r--bootloader/ipod.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index 680331cd3e..a35dd33cf1 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -40,6 +40,7 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "hwcompat.h"
#define XSC(X) #X
#define SC(X) XSC(X)
@@ -55,12 +56,6 @@ unsigned char *loadbuffer = (unsigned char *)DRAM_START;
/* Bootloader version */
char version[] = APPSVERSION;
-#define IPOD_HW_REVISION (*((volatile unsigned long*)(0x00002084)))
-
-/* We copy the hardware revision to the last four bytes of SDRAM and then
- re-read it after we have re-mapped SDRAM to 0x0 in Rockbox */
-#define TMP_IPOD_HW_REVISION (*((volatile unsigned long*)(0x11fffffc)))
-
#define BUTTON_LEFT 1
#define BUTTON_MENU 2
#define BUTTON_RIGHT 3
@@ -240,9 +235,6 @@ void* main(void)
__backlight_on();
- TMP_IPOD_HW_REVISION = IPOD_HW_REVISION;
- ipod_hw_rev = IPOD_HW_REVISION;
-
system_init();
kernel_init();
lcd_init();
@@ -300,7 +292,6 @@ void* main(void)
printf("Partition 1: 0x%02x %ld MB",
pinfo->type, pinfo->size / 2048);
-
if (button_was_held || (btn==BUTTON_MENU)) {
/* If either the hold switch was on, or the Menu button was held, then
try the Apple firmware */