1 files changed, 12 insertions, 9 deletions

diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c
index e04255746f..c4651a3c80 100644
--- a/firmware/target/coldfire/system-coldfire.c
+++ b/firmware/target/coldfire/system-coldfire.c
@@ -177,16 +177,11 @@ static void system_display_exception_info(unsigned long format,
     lcd_puts(0, 1, str);
     lcd_update();
 
-    /* set cpu frequency to 11mhz (to prevent overheating) */
-    DCR   = (DCR & ~0x01ff) | 1;
-    PLLCR = EXCP_PLLCR;
+    system_exception_wait();
 
-    while (1)
-    {
-        if ((EXCP_BUTTON_GPIO_READ & EXCP_BUTTON_MASK) == EXCP_BUTTON_VALUE)
-            SYPCR = 0xc0;
-           /* Start watchdog timer with 512 cycles timeout. Don't service it. */
-    }
+    /* Start watchdog timer with 512 cycles timeout. Don't service it. */
+    SYPCR = 0xc0;
+    while (1);
 
     /* We need a reset method that works in all cases. Calling system_reboot()
        doesn't work when we're called from the debug interrupt, because then
@@ -294,6 +289,14 @@ void system_reboot (void)
     asm(" jmp (%a0)");
 }
 
+void system_exception_wait(void)
+{
+    /* set cpu frequency to 11mhz (to prevent overheating) */
+    DCR = (DCR & ~0x01ff) | 1;
+    PLLCR = EXCP_PLLCR;
+    while ((EXCP_BUTTON_GPIO_READ & EXCP_BUTTON_MASK) != EXCP_BUTTON_VALUE);
+}
+
 /* Utilise the breakpoint hardware to catch invalid memory accesses. */
 int system_memory_guard(int newmode)
 {