diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/panic.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/system-tcc780x.c | 9 |
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, ...) | |||
111 | if ((GPIO_READ & 0x0c000000) == 0x08000000) /* check for ON button and !hold */ | 111 | if ((GPIO_READ & 0x0c000000) == 0x08000000) /* check for ON button and !hold */ |
112 | #elif defined(IAUDIO_M3) | 112 | #elif defined(IAUDIO_M3) |
113 | if ((GPIO1_READ & 0x202) == 0x200) /* check for ON button and !hold */ | 113 | if ((GPIO1_READ & 0x202) == 0x200) /* check for ON button and !hold */ |
114 | #elif defined(COWON_D2) | ||
115 | if (GPIOA & 0x10) /* check for power button */ | ||
114 | #elif CONFIG_CPU == SH7034 | 116 | #elif CONFIG_CPU == SH7034 |
115 | #if CONFIG_KEYPAD == PLAYER_PAD | 117 | #if CONFIG_KEYPAD == PLAYER_PAD |
116 | if (!(PADRL & 0x20)) | 118 | 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) | |||
275 | 275 | ||
276 | void system_reboot(void) | 276 | void system_reboot(void) |
277 | { | 277 | { |
278 | SWRESET = -1; | 278 | disable_interrupt(IRQ_FIQ_DISABLED); |
279 | |||
280 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | ||
281 | set_cpu_frequency(CPUFREQ_DEFAULT); | ||
282 | #endif | ||
283 | |||
284 | /* TODO: implement reboot (eg. jump to boot ROM?) */ | ||
285 | while (1); | ||
279 | } | 286 | } |
280 | 287 | ||
281 | int system_memory_guard(int newmode) | 288 | int system_memory_guard(int newmode) |