Merge pull request #3 from OlegHahm/lpc1768_reset

Lpc1768 reset
RIOT-OS · Feb 17, 2014 · e3a426c · e3a426c
2 parents 3753f38 + 0467181
commit e3a426c
Showing 1 changed file with 60 additions and 34 deletions.
diff --git a/cpu/lpc1768/cpu.c b/cpu/lpc1768/cpu.c
@@ -14,28 +14,29 @@
 
 #include <stdint.h>
 #include "cpu.h"
+#include "kernel.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
 
 int inISR(void)
 {
-	return (__get_IPSR() & 0xFF);
+    return (__get_IPSR() & 0xFF);
 }
 
 unsigned int disableIRQ(void)
 {
-	// FIXME PRIMASK is the old CPSR (FAULTMASK ??? BASEPRI ???)
-	//PRIMASK lesen
-	unsigned int uiPriMask = __get_PRIMASK();
-	__disable_irq();
-	return uiPriMask;
+    // FIXME PRIMASK is the old CPSR (FAULTMASK ??? BASEPRI ???)
+    //PRIMASK lesen
+    unsigned int uiPriMask = __get_PRIMASK();
+    __disable_irq();
+    return uiPriMask;
 }
 
 void restoreIRQ(unsigned oldPRIMASK)
 {
-	//PRIMASK lesen setzen
-	 __set_PRIMASK(oldPRIMASK);
+    //PRIMASK lesen setzen
+     __set_PRIMASK(oldPRIMASK);
 }
 
 
@@ -75,34 +76,59 @@ void eINT(void)
 
 void save_context(void)
 {
-	/* {r0-r3,r12,LR,PC,xPSR} are saved automatically on exception entry */
-	asm("push 	{r4-r11}");
-	/* save unsaved registers */
-	asm("push 	{LR}");
-	/* save exception return value */
-
-	asm("ldr     r1, =active_thread");
-	/* load address of currend pdc */
-	asm("ldr     r1, [r1]");
-	/* deref pdc */
-	asm("str     sp, [r1]");
-	/* write sp to pdc->sp means current threads stack pointer */
+    /* {r0-r3,r12,LR,PC,xPSR} are saved automatically on exception entry */
+    asm("push   {r4-r11}");
+    /* save unsaved registers */
+    asm("push   {LR}");
+    /* save exception return value */
+
+    asm("ldr     r1, =active_thread");
+    /* load address of currend pdc */
+    asm("ldr     r1, [r1]");
+    /* deref pdc */
+    asm("str     sp, [r1]");
+    /* write sp to pdc->sp means current threads stack pointer */
 }
 
 void restore_context(void)
 {
-	asm("ldr     r0, =active_thread");
-	/* load address of currend pdc */
-	asm("ldr     r0, [r0]");
-	/* deref pdc */
-	asm("ldr     sp, [r0]");
-	/* load pdc->sp to sp register */
-
-	asm("pop		{r0}");
-	/* restore exception retrun value from stack */
-	asm("pop		{r4-r11}");
-	/* load unloaded register */
-//	asm("pop 		{r4}"); /*foo*/
-	asm("bx		r0");				/* load exception return value to pc causes end of exception*/
-							/* {r0-r3,r12,LR,PC,xPSR} are restored automatically on exception return */
+    asm("ldr     r0, =active_thread");
+    /* load address of currend pdc */
+    asm("ldr     r0, [r0]");
+    /* deref pdc */
+    asm("ldr     sp, [r0]");
+    /* load pdc->sp to sp register */
+
+    asm("pop        {r0}");
+    /* restore exception retrun value from stack */
+    asm("pop        {r4-r11}");
+    /* load unloaded register */
+//  asm("pop        {r4}"); /*foo*/
+    asm("bx     r0");               /* load exception return value to pc causes end of exception*/
+                            /* {r0-r3,r12,LR,PC,xPSR} are restored automatically on exception return */
+}
+
+#define USR_RESET   (0x102)
+#define SWI         (0xAB)
+
+__attribute__((naked,noreturn)) void arm_reset(void)
+{
+     int value;
+
+     asm volatile (
+        "mov r0, %1"          "\n\t"
+        "mov r1, %2"          "\n\t"
+        "bkpt" " %a3"   "\n\t"
+        "mov %0, r0"
+        : "=r" (value)                                         /* output operands             */
+        : "r" USR_RESET, "r" NULL, "i" SWI                     /* input operands              */
+        : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc"   /* list of clobbered registers */
+     );
+}
+
+NORETURN void reboot(void)
+{
+    while (1) {
+        arm_reset();
+    }
 }