From bf2860446055bbedbc17f30dacbcff5044e342a4 Mon Sep 17 00:00:00 2001 From: dave Date: Sun, 4 Oct 2009 16:08:33 +0000 Subject: [PATCH] Another patch from FS#10633 by Michael Sparmann (with a couple of minor cosmetic tweaks by me) - cleanly unmount the flash when powering off or rebooting. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22920 a1c6a512-1295-4272-9138-f99709370657 --- .../target/arm/s5l8700/ipodnano2g/power-nano2g.c | 9 ++++++++- firmware/target/arm/s5l8700/system-s5l8700.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c index aa3367b94..fbd5157fb 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c @@ -23,6 +23,10 @@ #include "inttypes.h" #include "s5l8700.h" #include "power.h" +#include "ftl-target.h" +#include +#include "panic.h" + /* Power handling for S5L8700 based Meizu players @@ -32,7 +36,10 @@ void power_off(void) { - /* TODO */ + if (ftl_sync() != 0) panicf("Failed to unmount flash!"); + + /* TODO: Really power-off */ + panicf("Poweroff not implemented yet."); while(1); } diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c index f04f2f92f..070d3b946 100644 --- a/firmware/target/arm/s5l8700/system-s5l8700.c +++ b/firmware/target/arm/s5l8700/system-s5l8700.c @@ -22,6 +22,9 @@ #include "kernel.h" #include "system.h" #include "panic.h" +#ifdef IPOD_NANO2G +#include "ftl-target.h" +#endif #define default_interrupt(name) \ extern __attribute__((weak,alias("UIRQ"))) void name (void) @@ -151,6 +154,24 @@ void system_init(void) void system_reboot(void) { +#ifdef IPODNANO2G + if (ftl_sync() != 0) panicf("Failed to unmount flash!"); + + /* Reset the SoC */ + asm volatile(" \ + msr CPSR_c, #0xd3 \ + mov r5, #0x110000 \ + add r5, r5, #0xff \ + add r6, r5, #0xa00 \ + mov r10, #0x3c800000 \ + str r6, [r10] \ + mov r6, #0xff0 \ + str r6, [r10,#4] \ + str r5, [r10]") + + /* Wait for reboot to kick in */ + while(1); +#endif } void system_exception_wait(void) -- 2.11.4.GIT