From e2b6b440e12562804f161d8db677554bbd666bd1 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 10 Jan 2009 16:21:27 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@612
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/MSP430-MSP430x1611-GCC/board.c  | 6 +++---
 demos/MSP430-MSP430x1611-GCC/chconf.h | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'demos/MSP430-MSP430x1611-GCC')

diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c
index f5e5e4012..51a50afb0 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.c
+++ b/demos/MSP430-MSP430x1611-GCC/board.c
@@ -85,13 +85,13 @@ void hwinit(void) {
   InitSerial();
 }
 
-SYS_IRQ_HANDLER(TIMERA0_VECTOR) tmr0irq(void) {
+CH_IRQ_HANDLER(TIMERA0_VECTOR) tmr0irq(void) {
 
-  SYS_IRQ_PROLOGUE();
+  CH_IRQ_PROLOGUE();
 
   chSysLockI();
   chSysTimerHandlerI();
   chSysUnlockI();
 
-  SYS_IRQ_EPILOGUE();
+  CH_IRQ_EPILOGUE();
 }
diff --git a/demos/MSP430-MSP430x1611-GCC/chconf.h b/demos/MSP430-MSP430x1611-GCC/chconf.h
index bf7a9afad..10be65000 100644
--- a/demos/MSP430-MSP430x1611-GCC/chconf.h
+++ b/demos/MSP430-MSP430x1611-GCC/chconf.h
@@ -35,6 +35,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
-- 
cgit v1.2.3