From ebc076bc15d6501674b9db772557a0eadfb4a5e2 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Wed, 25 Jul 2007 13:12:38 +0000 Subject: 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 --- bootloader/ipod.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'bootloader/ipod.c') 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 */ -- cgit