Imported msp430-libc-20100207

[msp430-libc.git] / include / iomacros.h

diff --git a/include/iomacros.h b/include/iomacros.h
index 92f384840b845b051e27f29ea83f6b20c00cb616..eaf0c9429b91a41f454c715bb27e1fcab3cace78 100644 (file)
--- a/include/iomacros.h
+++ b/include/iomacros.h
@@ -23,13 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: iomacros.h,v 1.35 2008/05/26 20:27:51 cliechti Exp $
+ * $Id: iomacros.h,v 1.36 2008/10/09 15:00:13 sb-sf Exp $
  */
 
 #if !defined(__IOMACROS_H_)
 #define __IOMACROS_H_
 
-#if !defined(_GNU_ASSEMBLER_)
+#if !defined(__ASSEMBLER__)
 
 #include <sys/inttypes.h>
 
@@ -116,7 +116,7 @@ void x (void)
 #define __bis_SR_register(x)    __asm__ __volatile__("bis      %0, r2" : : "ir" ((uint16_t) x))
 #define __bic_SR_register(x)    __asm__ __volatile__("bic      %0, r2" : : "ir" ((uint16_t) x))
 
-#if __GNUC_MINOR__ >= 4
+#if __GNUC__ >= 4
 
 extern void __bis_sr_irq(int);
 extern void __bic_sr_irq(int);
@@ -195,7 +195,7 @@ do \
     #define sfrw_(x,x_) \
            extern "C" volatile unsigned int x asm(#x_)
 
-#if defined(__MSP430X__)
+#if defined(__MSP430X__) || defined(__MSP430X2__)
     #define sfra_(x,x_) \
            extern "C" volatile unsigned long int x asm(#x_)
 #endif
@@ -206,7 +206,7 @@ do \
     #define sfrw_(x,x_) \
            volatile unsigned int x asm(#x_)
 
-#if defined(__MSP430X__)
+#if defined(__MSP430X__) || defined(__MSP430X2__)
     #define sfra_(x,x_) \
            volatile unsigned long int x asm(#x_)
 #endif
@@ -216,7 +216,7 @@ do \
 
 #define sfrw(x,x_) sfrw_(x,x_)
 
-#if defined(__MSP430X__)
+#if defined(__MSP430X__) ||defined(__MSP430X2__)
 #define sfra(x,x_) sfra_(x,x_)
 #endif
 
@@ -306,17 +306,17 @@ do \
 
 #define MARK_VOLATILE  __asm__ __volatile__("; volatile")
 
-#endif /* not _GNU_ASSEMBLER_ */
+#endif /* not __ASSEMBLER__ */
 
 /*
  *  Defines for assembler.
  *  Hope there is a better way to do this.
  */
-#if defined(_GNU_ASSEMBLER_)
+#if defined(__ASSEMBLER__)
 
 #define sfrb(x,x_) x=x_
 #define sfrw(x,x_) x=x_
-#if defined(__MSP430X__)
+#if defined(__MSP430X__) ||defined(__MSP430X2__)
 #define sfra(x,x_) x=x_
 #endif