git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@136 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 35 insertions, 21 deletions

diff --git a/demos/ARM7-LPC214x-GCC-minimal/chcore.c b/demos/ARM7-LPC214x-GCC-minimal/chcore.c
index f4127cc8e..f46b932be 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/chcore.c
+++ b/demos/ARM7-LPC214x-GCC-minimal/chcore.c
@@ -24,6 +24,7 @@
 //#include "lpc214x_serial.h"

 //#include "lpc214x_ssp.h"

 //#include "mmcsd.h"

+

 //#include "buzzer.h"

 

 extern void IrqHandler(void);

@@ -115,13 +116,11 @@ void hwinit(void) {
    */

   InitVIC();

   VICDefVectAddr = (IOREG32)IrqHandler;

-  SetVICVector(T0IrqHandler, 0, SOURCE_Timer0);

-//  SetVICVector(UART0IrqHandler, 1, SOURCE_UART0);

-//  SetVICVector(UART1IrqHandler, 2, SOURCE_UART1);

 

   /*

    * System Timer initialization, 1ms intervals.

    */

+  SetVICVector(T0IrqHandler, 0, SOURCE_Timer0);

   VICIntEnable = INTMASK(SOURCE_Timer0);

   TC *timer = T0Base;

   timer->TC_PR = VAL_TC0_PRESCALER;

@@ -133,7 +132,7 @@ void hwinit(void) {
   /*

    * Other subsystems.

    */

-//  InitSerial();

+//  InitSerial(1, 2);

 //  InitSSP();

 //  InitMMC();

 //  InitBuzzer();

@@ -152,19 +151,6 @@ void _IdleThread(void *p) {
 }

 

 /*

- * System halt.

- * Yellow LED only.

- */

-void chSysHalt(void) {

-

-  chSysLock();

-  IO0SET = 0x00000C00;

-  IO0CLR = 0x80000000;

-  while (TRUE)

-    ;

-}

-

-/*

  * System console message (not implemented).

  */

 void chSysPuts(char *msg) {

@@ -173,17 +159,45 @@ void chSysPuts(char *msg) {
 /*

  * Non-vectored IRQs handling here.

  */

-void NonVectoredIrq(void) {

-

+__attribute__((naked, weak))

+void IrqHandler(void) {

+

+  asm(".code 32                                 \n\t" \

+      "stmfd    sp!, {r0-r3, r12, lr}           \n\t");

+#ifdef THUMB

+  asm("add      r0, pc, #1                      \n\t" \

+      "bx       r0                              \n\t" \

+      ".code 16                                 \n\t");

   VICVectAddr = 0;

+  asm("ldr      r0, =IrqCommon                  \n\t" \

+      "bx       r0                              \n\t");

+#else

+  VICVectAddr = 0;

+  asm("b        IrqCommon                       \n\t");

+#endif

 }

 

 /*

  * Timer 0 IRQ handling here.

  */

-void Timer0Irq(void) {

-

+__attribute__((naked, weak))

+void T0IrqHandler(void) {

+

+  asm(".code 32                                 \n\t" \

+      "stmfd    sp!, {r0-r3, r12, lr}           \n\t");

+#ifdef THUMB

+  asm("add      r0, pc, #1                      \n\t" \

+      "bx       r0                              \n\t" \

+      ".code 16                                 \n\t");

+  T0IR = 1;             /* Clear interrupt on match MR0. */

+  chSysTimerHandlerI();

+  VICVectAddr = 0;

+  asm("ldr      r0, =IrqCommon                  \n\t" \

+      "bx       r0                              \n\t");

+#else

   T0IR = 1;             /* Clear interrupt on match MR0. */

   chSysTimerHandlerI();

   VICVectAddr = 0;

+  asm("b        IrqCommon                       \n\t");

+#endif

 }