diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2009-10-12 08:54:51 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2009-10-12 08:54:51 +0000 |
| commit | 6b1729592607b44fd22aa464cbb28c4dc8cf3e8b (patch) | |
| tree | e8895c7c3a354ceaec67f862ec61fa01d12187af | |
| parent | 461903d80eb51439bfa25bad84cd0e061768a448 (diff) | |
| download | rockbox-6b1729592607b44fd22aa464cbb28c4dc8cf3e8b.zip rockbox-6b1729592607b44fd22aa464cbb28c4dc8cf3e8b.tar.gz rockbox-6b1729592607b44fd22aa464cbb28c4dc8cf3e8b.tar.bz2 rockbox-6b1729592607b44fd22aa464cbb28c4dc8cf3e8b.tar.xz | |
Bring the iPod Nano 2G shutdown FTL panics back.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23126 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/s5l8700/ata-nand-s5l8700.c | 4 | ||||
| -rw-r--r-- | firmware/target/arm/s5l8700/system-s5l8700.c | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c index d005802..ce1fa4d 100644 --- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c +++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c @@ -102,7 +102,9 @@ long nand_last_disk_activity(void) int nand_flush(void) { last_disk_activity = current_tick; - return ftl_sync(); + int rc = ftl_sync(); + if (rc != 0) panicf("Failed to unmount flash: %X", rc); + return rc; } #endif diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c index 394a473..63bd47e 100644 --- a/firmware/target/arm/s5l8700/system-s5l8700.c +++ b/firmware/target/arm/s5l8700/system-s5l8700.c @@ -23,7 +23,7 @@ #include "system.h" #include "panic.h" #ifdef IPOD_NANO2G -#include "ftl-target.h" +#include "storage.h" #endif #define default_interrupt(name) \ @@ -150,6 +150,15 @@ void fiq_handler(void) } +static void gpio_init(void) +{ +} + +static void clock_init(void) +{ +} + + void system_init(void) { } @@ -157,7 +166,9 @@ void system_init(void) void system_reboot(void) { #ifdef IPOD_NANO2G - if (ftl_sync() != 0) panicf("Failed to unmount flash!"); +#ifdef HAVE_STORAGE_FLUSH + storage_flush(); +#endif /* Reset the SoC */ asm volatile("msr CPSR_c, #0xd3 \n" |