4 files changed, 17 insertions, 10 deletions
diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile
index 9bd08a8ee..bb2c22929 100644
--- a/demos/ARM7-LPC214x-G++/Makefile
+++ b/demos/ARM7-LPC214x-G++/Makefile
@@ -93,7 +93,7 @@ TCSRC =
 TCPPSRC =
 
 # 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-G++/Makefile.thumb b/demos/ARM7-LPC214x-G++/Makefile.thumb
index 177e7cda0..8d3ec2c0c 100644
--- a/demos/ARM7-LPC214x-G++/Makefile.thumb
+++ b/demos/ARM7-LPC214x-G++/Makefile.thumb
@@ -93,7 +93,7 @@ TCSRC = ../../ports/ARM7-LPC214x/chcore.c \
 TCPPSRC = ../../src/lib/ch.cpp main.cpp
 
 # 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-G++/board.c b/demos/ARM7-LPC214x-G++/board.c
index 8b17399e0..fef4deb36 100644
--- a/demos/ARM7-LPC214x-G++/board.c
+++ b/demos/ARM7-LPC214x-G++/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-G++/chconf.h b/demos/ARM7-LPC214x-G++/chconf.h
index 2d0a1513f..73323e4cf 100644
--- a/demos/ARM7-LPC214x-G++/chconf.h
+++ b/demos/ARM7-LPC214x-G++/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