diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2010-03-11 03:22:43 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2010-03-11 03:22:43 +0000 |
| commit | db569e6bbc833168c9e5fcfd3b1160658661a923 (patch) | |
| tree | 89679cd45baca82029a8a831cb54a28f02abf454 /firmware | |
| parent | 20980e6e72f919a4ff7061842b05afe9917c50f0 (diff) | |
Fix bootloader red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25112 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/target/arm/s5l8700/debug-s5l8700.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/firmware/target/arm/s5l8700/debug-s5l8700.c b/firmware/target/arm/s5l8700/debug-s5l8700.c index fc8b582408..40fcd7c94c 100644 --- a/firmware/target/arm/s5l8700/debug-s5l8700.c +++ b/firmware/target/arm/s5l8700/debug-s5l8700.c @@ -28,7 +28,9 @@ #include "font.h" #include "sprintf.h" #include "storage.h" +#ifndef BOOTLOADER #include "action.h" +#endif #ifdef IPOD_NANO2G #include "power.h" #include "pmu-target.h" @@ -51,8 +53,10 @@ bool __dbg_hw_info(void) int line; int i; #ifdef IPOD_NANO2G - unsigned int state; +#ifndef BOOTLOADER + unsigned int state = 0; const unsigned int max_states=2; +#endif int nand_bank_count; struct storage_info info; const struct nand_device_info_type *nand_devicetype[4]; @@ -63,14 +67,14 @@ bool __dbg_hw_info(void) nand_devicetype[i] = nand_get_device_type(i); if(nand_devicetype[i] != NULL) nand_bank_count++; } - state=0; #endif lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); +#ifndef BOOTLOADER state=0; - +#endif while(1) { lcd_clear_display(); @@ -79,8 +83,10 @@ bool __dbg_hw_info(void) /* _DEBUG_PRINTF statements can be added here to show debug info */ #ifdef IPOD_NANO2G +#ifndef BOOTLOADER if(state == 0) { +#endif _DEBUG_PRINTF("CPU:"); _DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick); line++; @@ -103,6 +109,7 @@ bool __dbg_hw_info(void) _DEBUG_PRINTF("sectors: %d", info.num_sectors); _DEBUG_PRINTF("sector size: %d", info.sector_size); _DEBUG_PRINTF("last disk activity: %d", (unsigned int)nand_last_disk_activity()); +#ifndef BOOTLOADER } else if(state==1) { @@ -137,12 +144,14 @@ bool __dbg_hw_info(void) { state=0; } +#endif #else _DEBUG_PRINTF("__dbg_hw_info"); #endif lcd_update(); +#ifndef BOOTLOADER switch(get_action(CONTEXT_STD,HZ/20)) { case ACTION_STD_PREV: @@ -160,6 +169,7 @@ bool __dbg_hw_info(void) lcd_setfont(FONT_UI); return false; } +#endif } lcd_setfont(FONT_UI); |