From bf299b1a071110af90c2dde6f90a17b2511471a8 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Fri, 23 Sep 2011 15:48:05 +0200
Subject: [PATCH] Fixed splhigh/splx for the IAR compiler

---
 cpu/msp430/msp430.c    | 20 ++++++++++----------
 cpu/msp430/msp430def.h |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cpu/msp430/msp430.c b/cpu/msp430/msp430.c
index 793defc35..1eff4e261 100644
--- a/cpu/msp430/msp430.c
+++ b/cpu/msp430/msp430.c
@@ -275,16 +275,16 @@ splhigh_(void)
 /*
  * Restore previous interrupt mask.
  */
-void
-splx_(int sr)
-{
-#ifdef __IAR_SYSTEMS_ICC__
-  __bis_SR_register(sr);
-#else
-  /* If GIE was set, restore it. */
-  asmv("bis %0, r2" : : "r" (sr));
-#endif
-}
+/* void */
+/* splx_(int sr) */
+/* { */
+/* #ifdef __IAR_SYSTEMS_ICC__ */
+/*   __bis_SR_register(sr); */
+/* #else */
+/*   /\* If GIE was set, restore it. *\/ */
+/*   asmv("bis %0, r2" : : "r" (sr)); */
+/* #endif */
+/* } */
 /*---------------------------------------------------------------------------*/
 /* this code will always start the TimerB if not already started */
 void
diff --git a/cpu/msp430/msp430def.h b/cpu/msp430/msp430def.h
index f869241c6..2738b7ed7 100644
--- a/cpu/msp430/msp430def.h
+++ b/cpu/msp430/msp430def.h
@@ -91,12 +91,12 @@ void msp430_sync_dco(void);
 void   *sbrk(int);
 
 typedef int spl_t;
-void    splx_(spl_t);
+/* void    splx_(spl_t); */
 spl_t   splhigh_(void);
 
 #define splhigh() splhigh_()
 #ifdef __IAR_SYSTEMS_ICC__
-#define splx(sr) sr = __get_SR_register()
+#define splx(sr) __bis_SR_register(sr)
 #else
 #define splx(sr) __asm__ __volatile__("bis %0, r2" : : "r" (sr))
 #endif