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

3 files changed, 16 insertions, 9 deletions

diff --git a/demos/ARM7-LPC214x-GCC/Makefile.thumb b/demos/ARM7-LPC214x-GCC/Makefile.thumb
index a676a4af1..211107deb 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile.thumb
+++ b/demos/ARM7-LPC214x-GCC/Makefile.thumb
@@ -84,7 +84,7 @@ TSRC = ../../ports/ARM7-LPC214x/chcore.c \
        board.c buzzer.c mmcsd.c main.c

 

 # List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chsys.s \

+ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chsysasm.s \

          ../../ports/ARM7-LPC214x/vectors.s

 

 # List all user directories here

diff --git a/demos/ARM7-LPC214x-GCC/board.c b/demos/ARM7-LPC214x-GCC/board.c
index 9f453100c..767fb9123 100644
--- a/demos/ARM7-LPC214x-GCC/board.c
+++ b/demos/ARM7-LPC214x-GCC/board.c
@@ -31,30 +31,28 @@
 /*

  * Non-vectored IRQs handling here.

  */

-__attribute__((naked))

-static void IrqHandler(void) {

+CH_IRQ_HANDLER static void IrqHandler(void) {

 

-  chSysIRQEnterI();

+  CH_IRQ_PROLOGUE();

 

   /* nothing */

   VICVectAddr = 0;

 

-  chSysIRQExitI();

+  CH_IRQ_EPILOGUE();

 }

 

 /*

  * Timer 0 IRQ handling here.

  */

-__attribute__((naked))

-static void T0IrqHandler(void) {

+CH_IRQ_HANDLER static void T0IrqHandler(void) {

 

-  chSysIRQEnterI();

+  CH_IRQ_PROLOGUE();

 

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

   chSysTimerHandlerI();

   VICVectAddr = 0;

 

-  chSysIRQExitI();

+  CH_IRQ_EPILOGUE();

 }

 

 /*

diff --git a/demos/ARM7-LPC214x-GCC/chconf.h b/demos/ARM7-LPC214x-GCC/chconf.h
index ed950dd3f..cc2870abd 100644
--- a/demos/ARM7-LPC214x-GCC/chconf.h
+++ b/demos/ARM7-LPC214x-GCC/chconf.h
@@ -30,6 +30,15 @@
  *  that this is not related to the compiler optimization options.*/

 #define CH_OPTIMIZE_SPEED

 

+/** Configuration option: If enabled then the used of nested @p chSysLock() /

+ *  @p chSysUnlock() operations is allowed.<br>

+ *  For performance and code size reasons the recommended setting is leave

+ *  this option disabled.<br>

+ *  You can use this option if you need to merge ChibiOS/RT with external

+ *  libraries that require nested lock/unlock operations.

+ */

+//#define CH_USE_NESTED_LOCKS

+

 /** Configuration option: if specified then the kernel performs the round

  *  robin scheduling algorithm on threads of equal priority. */

 #define CH_USE_ROUNDROBIN