Improved support for the IAR compiler.

io and signal have been moved into contiki include file.

platform/exp5438/uart1x.c

@@ -36,13 +36,6 @@
  */
 
 #include "contiki.h"
-#ifdef __IAR_SYSTEMS_ICC__
-#include <msp430.h>
-#else
-#include <io.h>
-#include <signal.h>
-#endif
-
 #include <stdlib.h>
 
 #include "sys/energest.h"
@@ -50,6 +43,7 @@
 #include "dev/watchdog.h"
 #include "lib/ringbuf.h"
 #include "dev/leds.h"
+#include "isr_compat.h"
 
 static int (*uart1_input_handler)(unsigned char c);
 
@@ -114,13 +108,7 @@ uart1_init(unsigned long ubr)
   UCA1IE |= UCRXIE;                        /* Enable UCA1 RX interrupt */
 }
 /*---------------------------------------------------------------------------*/
-#ifdef __IAR_SYSTEMS_ICC__
-#pragma vector=USCI_A1_VECTOR
-__interrupt void
-#else
-interrupt(USCI_A1_VECTOR)
-#endif
-uart1_rx_interrupt(void)
+ISR(USCI_A1, uart1_rx_interrupt)
 {
   uint8_t c;