fixed Sky platform for IAR compiler

platform/sky/dev/battery-sensor.c

@@ -36,9 +36,14 @@
  *           $Revision: 1.11 $
  */
 
+#include "contiki.h"
 #include "dev/battery-sensor.h"
 #include "dev/sky-sensors.h"
+#ifdef __IAR_SYSTEMS_ICC__
+#include <msp430.h>
+#else
 #include <io.h>
+#endif
 
 /* Configure ADC12_2 to sample channel 11 (voltage) and use */
 /* the Vref+ as reference (SREF_1) since it is a stable reference */

platform/sky/dev/button-sensor.c

@@ -33,7 +33,12 @@
 #include "lib/sensors.h"
 #include "dev/hwconf.h"
 #include "dev/button-sensor.h"
+
+#ifdef __IAR_SYSTEMS_ICC__
+#include <msp430.h>
+#else
 #include <signal.h>
+#endif
 
 const struct sensors_sensor button_sensor;
 
@@ -44,7 +49,12 @@ HWCONF_PIN(BUTTON, 2, 7);
 HWCONF_IRQ(BUTTON, 2, 7);
 
 /*---------------------------------------------------------------------------*/
+#ifdef __IAR_SYSTEMS_ICC__
+#pragma vector=PORT2_VECTOR
+__interrupt void
+#else
 interrupt(PORT2_VECTOR)
+#endif
      irq_p2(void)
 {
   ENERGEST_ON(ENERGEST_TYPE_IRQ);

platform/sky/dev/i2c.c

@@ -41,10 +41,14 @@
  */
 
 #include <stdio.h>
-
-#include <io.h>
-
 #include <contiki.h>
+
+#ifdef __IAR_SYSTEMS_ICC__
+#include <msp430.h>
+#else
+#include <io.h>
+#endif
+
 #include <dev/spi.h>
 #include <dev/leds.h>
 

platform/sky/dev/light-sensor.c

@@ -36,7 +36,11 @@
 #include "dev/sky-sensors.h"
 #include "dev/light-sensor.h"
 
+#ifdef __IAR_SYSTEMS_ICC__
+#include <msp430.h>
+#else
 #include <io.h>
+#endif
 
 /* Photodiode 1 (P64) on INCH_4 */
 /* Photodiode 2 (P65) on INCH_5 */

platform/sky/dev/sky-sensors.c

@@ -38,8 +38,13 @@
  *           $Revision: 1.3 $
  */
 #include "contiki.h"
-#include "lib/sensors.h"
+
+#ifdef __IAR_SYSTEMS_ICC__
+#include <msp430.h>
+#else
 #include <io.h>
+#endif
+#include "lib/sensors.h"
 
 #define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno]
 

platform/sky/dev/xmem.c

@@ -39,13 +39,18 @@
  *         unwritten data will read as zeros (UNIX style).
  */
 
+
+#include "contiki.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef __IAR_SYSTEMS_ICC__
+#include <msp430.h>
+#else
 #include <io.h>
 #include <signal.h>
+#endif
 
-#include "contiki.h"
 
 #include "dev/spi.h"
 #include "dev/xmem.h"