len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 05:05:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bring the iPod Nano 2G shutdown FTL panics back.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23126 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2009-10-12 08:54:51 +00:00
parent 461903d80e
commit 6b17295926
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/target/arm/s5l8700/ata-nand-s5l8700.c
View file

@ -102,7 +102,9 @@ long nand_last_disk_activity(void)
int nand_flush(void) int nand_flush(void)
{ {
last_disk_activity = current_tick; 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 #endif

15
firmware/target/arm/s5l8700/system-s5l8700.c
View file

@ -23,7 +23,7 @@
#include "system.h" #include "system.h"
#include "panic.h" #include "panic.h"
#ifdef IPOD_NANO2G #ifdef IPOD_NANO2G
#include "ftl-target.h" #include "storage.h"
#endif #endif
#define default_interrupt(name) \ #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) void system_init(void)
{ {
} }
@ -157,7 +166,9 @@ void system_init(void)
void system_reboot(void) void system_reboot(void)
{ {
#ifdef IPOD_NANO2G #ifdef IPOD_NANO2G
if (ftl_sync() != 0) panicf("Failed to unmount flash!"); #ifdef HAVE_STORAGE_FLUSH
storage_flush();
#endif
/* Reset the SoC */ /* Reset the SoC */
asm volatile("msr CPSR_c, #0xd3 \n" asm volatile("msr CPSR_c, #0xd3 \n"