D2: Stop panic screen from crashing instantly (seems this has been broken for a while).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17670 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 10 insertions, 1 deletions

diff --git a/firmware/panic.c b/firmware/panic.c
index dca511473c..fbb6afc577 100644
--- a/firmware/panic.c
+++ b/firmware/panic.c
@@ -111,6 +111,8 @@ void panicf( const char *fmt, ...)
         if ((GPIO_READ & 0x0c000000) == 0x08000000) /* check for ON button and !hold */
 #elif defined(IAUDIO_M3)
         if ((GPIO1_READ & 0x202) == 0x200) /* check for ON button and !hold */
+#elif defined(COWON_D2)
+        if (GPIOA & 0x10) /* check for power button */
 #elif CONFIG_CPU == SH7034
 #if CONFIG_KEYPAD == PLAYER_PAD
         if (!(PADRL & 0x20))
diff --git a/firmware/target/arm/tcc780x/system-tcc780x.c b/firmware/target/arm/tcc780x/system-tcc780x.c
index 54cd3ffcb6..7e07ed7171 100644
--- a/firmware/target/arm/tcc780x/system-tcc780x.c
+++ b/firmware/target/arm/tcc780x/system-tcc780x.c
@@ -275,7 +275,14 @@ void system_init(void)
 
 void system_reboot(void)
 {
-    SWRESET = -1;
+    disable_interrupt(IRQ_FIQ_DISABLED);
+    
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    set_cpu_frequency(CPUFREQ_DEFAULT);
+#endif
+
+    /* TODO: implement reboot (eg. jump to boot ROM?) */
+    while (1);
 }
 
 int system_memory_guard(int newmode)