From 5b1d9617c4783182e2c13c2cee0a0612df4943cb Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Mon, 26 Sep 2011 10:38:41 +0200 Subject: [PATCH] moved io and signal and IAR-GCC checks from driver files into contiki include file --- core/dev/cc2420-aes.c | 6 ------ core/dev/cc2420.c | 6 ------ core/dev/ds2411.c | 6 ------ core/dev/sht11-sensor.c | 7 ------- core/dev/sht11.c | 8 -------- cpu/msp430/Makefile.msp430 | 4 +++- cpu/msp430/button.c | 4 ---- cpu/msp430/cc2420-arch-sfd.c | 7 ------- cpu/msp430/cc2420-arch.c | 8 -------- cpu/msp430/clock.c | 7 ------- cpu/msp430/dev/hwconf.h | 11 +---------- cpu/msp430/dev/uart0x.c | 7 ------- cpu/msp430/dev/uart1.c | 8 -------- cpu/msp430/dev/uart1x.c | 5 +---- cpu/msp430/flash.c | 9 --------- cpu/msp430/leds-arch.c | 6 ------ cpu/msp430/minileds.c | 3 --- cpu/msp430/msp430.c | 10 +--------- cpu/msp430/msp430def.h | 24 ++++++++++++++++++++++++ cpu/msp430/rom.c | 2 -- cpu/msp430/rtimer-arch.c | 9 --------- cpu/msp430/slip_uart0.c | 8 -------- cpu/msp430/slip_uart1.c | 6 ------ cpu/msp430/spi.c | 7 ------- cpu/msp430/spix.c | 7 ------- cpu/msp430/watchdog.c | 6 ------ platform/esb/Makefile.esb | 10 ++++++++++ platform/esb/contiki-conf.h | 14 +++++++++++--- platform/esb/contiki-esb-main.c | 2 -- platform/esb/dev/battery-sensor.c | 2 +- platform/esb/dev/beep.c | 3 +-- platform/esb/dev/ds1629.c | 3 +-- platform/esb/dev/eeprom.c | 4 ++-- platform/esb/dev/ir.c | 4 +--- platform/esb/dev/irq.c | 3 +-- platform/esb/dev/radio-sensor.c | 2 +- platform/esb/dev/rs232.c | 3 +-- platform/esb/dev/sound-sensor.c | 2 +- platform/esb/dev/tr1001-gcr.c | 3 +-- platform/esb/dev/tr1001.c | 3 +-- platform/jcreate/dev/acc-sensor.c | 2 +- platform/jcreate/dev/ext-sensor.c | 2 +- platform/jcreate/leds-arch.c | 4 +--- platform/msb430/contiki-msb430-main.c | 4 ---- platform/msb430/dev/adc.c | 3 +-- platform/msb430/dev/dma.c | 4 +--- platform/msb430/dev/msb430-uart1.c | 2 -- platform/msb430/dev/rs232.c | 4 +--- platform/msb430/dev/sd-arch.c | 1 - platform/msb430/dev/sd.c | 1 - platform/sky/checkpoint-arch.c | 7 ------- platform/sky/contiki-sky-main.c | 8 -------- platform/sky/dev/battery-sensor.c | 5 ----- platform/sky/dev/button-sensor.c | 7 +------ platform/sky/dev/i2c.c | 7 ------- platform/sky/dev/light-sensor.c | 6 ------ platform/sky/dev/light.c | 3 --- platform/sky/dev/sky-sensors.c | 6 ------ platform/sky/dev/temperature-sensor.c | 2 +- platform/sky/dev/xmem.c | 8 -------- platform/sky/platform-conf.h | 4 ---- platform/z1/checkpoint-arch.c | 9 --------- platform/z1/contiki-z1-main.c | 7 ------- platform/z1/dev/battery-sensor.c | 7 ------- platform/z1/dev/button-sensor.c | 7 ------- platform/z1/dev/cc2420-arch.c | 9 --------- platform/z1/dev/i2cmaster.h | 6 ------ platform/z1/dev/light-sensor.c | 7 ------- platform/z1/dev/light.c | 8 -------- platform/z1/dev/potentiometer-sensor.c | 8 -------- platform/z1/dev/sky-sensors.c | 5 ----- platform/z1/dev/temperature-sensor.c | 7 ------- platform/z1/dev/tmp102.c | 7 ------- platform/z1/dev/xmem.c | 7 ------- platform/z1/dev/z1-phidgets.c | 7 ------- platform/z1sp/dev/potentiometer-sensor.c | 2 +- 76 files changed, 72 insertions(+), 370 deletions(-) diff --git a/core/dev/cc2420-aes.c b/core/dev/cc2420-aes.c index 8f406c996..6ed4020f7 100644 --- a/core/dev/cc2420-aes.c +++ b/core/dev/cc2420-aes.c @@ -39,12 +39,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif #include "dev/cc2420.h" #include "dev/cc2420-aes.h" #include "dev/spi.h" diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c index a027f4c83..4cbd0aec7 100644 --- a/core/dev/cc2420.c +++ b/core/dev/cc2420.c @@ -40,12 +40,6 @@ #if defined(__AVR__) #include -#elif defined(__MSP430__) -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif #endif #include "dev/leds.h" diff --git a/core/dev/ds2411.c b/core/dev/ds2411.c index c93c465ed..34299a92d 100644 --- a/core/dev/ds2411.c +++ b/core/dev/ds2411.c @@ -51,12 +51,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - #include "dev/ds2411.h" unsigned char ds2411_id[8]; diff --git a/core/dev/sht11-sensor.c b/core/dev/sht11-sensor.c index 92f5c463a..5c59017e2 100644 --- a/core/dev/sht11-sensor.c +++ b/core/dev/sht11-sensor.c @@ -34,13 +34,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "lib/sensors.h" #include "dev/sht11.h" #include "dev/sht11-sensor.h" diff --git a/core/dev/sht11.c b/core/dev/sht11.c index 2f5548078..2b7f255ba 100644 --- a/core/dev/sht11.c +++ b/core/dev/sht11.c @@ -36,14 +36,6 @@ #include "contiki.h" #include - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include #include "sht11-arch.h" diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430 index 186a82565..70d2bcf77 100644 --- a/cpu/msp430/Makefile.msp430 +++ b/cpu/msp430/Makefile.msp430 @@ -41,6 +41,8 @@ IAR_PATH_C = $(shell dirname "$(IAR_BIN_PATH)") IAR_PATH = $(shell cygpath -m "$(IAR_PATH_C)") endif +CFLAGS += --diag_suppress=Pa050 --silent + #defaults on the MSP430X core include file here (xlfn.h) ifndef CFLAGSNO CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430xlfn.h" $(CFLAGSWERROR) @@ -72,7 +74,7 @@ OBJCOPY = msp430-objcopy STRIP = msp430-strip BSL = msp430-bsl CFLAGSNO = -Wall -mmcu=$(MCU) -g $(CFLAGSWERROR) -CFLAGS += $(CFLAGSNO) -Os +CFLAGS += $(CFLAGSNO) -Os -fno-strict-aliasing LDFLAGS += -mmcu=$(MCU) -Wl,-Map=contiki-$(TARGET).map endif diff --git a/cpu/msp430/button.c b/cpu/msp430/button.c index 00f57bce6..31eb9c006 100644 --- a/cpu/msp430/button.c +++ b/cpu/msp430/button.c @@ -29,11 +29,7 @@ * @(#)$Id: button.c,v 1.2 2006/08/17 15:41:13 bg- Exp $ */ -#include -#include - #include "contiki.h" - #include "dev/button.h" #define BUTTON_PORT 2 diff --git a/cpu/msp430/cc2420-arch-sfd.c b/cpu/msp430/cc2420-arch-sfd.c index b1fd06962..21e41b9d8 100644 --- a/cpu/msp430/cc2420-arch-sfd.c +++ b/cpu/msp430/cc2420-arch-sfd.c @@ -30,13 +30,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "dev/spi.h" #include "dev/cc2420.h" diff --git a/cpu/msp430/cc2420-arch.c b/cpu/msp430/cc2420-arch.c index dc1f67b81..abc44fa9a 100644 --- a/cpu/msp430/cc2420-arch.c +++ b/cpu/msp430/cc2420-arch.c @@ -30,14 +30,6 @@ */ #include "contiki.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "contiki-net.h" #include "dev/spi.h" diff --git a/cpu/msp430/clock.c b/cpu/msp430/clock.c index 034902538..fb54cbf73 100644 --- a/cpu/msp430/clock.c +++ b/cpu/msp430/clock.c @@ -33,13 +33,6 @@ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "sys/energest.h" #include "sys/clock.h" #include "sys/etimer.h" diff --git a/cpu/msp430/dev/hwconf.h b/cpu/msp430/dev/hwconf.h index bf3ed705f..70098cbb4 100644 --- a/cpu/msp430/dev/hwconf.h +++ b/cpu/msp430/dev/hwconf.h @@ -32,18 +32,9 @@ */ #ifndef __HWCONF_H__ #define __HWCONF_H__ - +#include "contiki.h" #include "sys/cc.h" -#ifdef __GNUC__ -#include -#include -#endif - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#endif - #define HWCONF_PIN(name, port, bit) \ static CC_INLINE void name##_SELECT() {P##port##SEL &= ~(1 << bit);} \ static CC_INLINE void name##_SELECT_IO() {P##port##SEL &= ~(1 << bit);} \ diff --git a/cpu/msp430/dev/uart0x.c b/cpu/msp430/dev/uart0x.c index 323dd880b..e79abacc1 100644 --- a/cpu/msp430/dev/uart0x.c +++ b/cpu/msp430/dev/uart0x.c @@ -36,13 +36,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "sys/energest.h" #include "dev/uart0.h" #include "dev/watchdog.h" diff --git a/cpu/msp430/dev/uart1.c b/cpu/msp430/dev/uart1.c index 363984eb1..5bcf6f694 100644 --- a/cpu/msp430/dev/uart1.c +++ b/cpu/msp430/dev/uart1.c @@ -35,14 +35,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif -#include - #include "sys/energest.h" #include "dev/uart1.h" #include "dev/watchdog.h" diff --git a/cpu/msp430/dev/uart1x.c b/cpu/msp430/dev/uart1x.c index 254578e70..d300e455a 100644 --- a/cpu/msp430/dev/uart1x.c +++ b/cpu/msp430/dev/uart1x.c @@ -32,11 +32,8 @@ /* * Machine dependent MSP430X UART1 code. */ - +#include "contiki.h" #include -#include -#include - #include "sys/energest.h" #include "dev/uart1.h" #include "dev/watchdog.h" diff --git a/cpu/msp430/flash.c b/cpu/msp430/flash.c index a55b2dec1..7e16052c3 100644 --- a/cpu/msp430/flash.c +++ b/cpu/msp430/flash.c @@ -36,15 +36,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#include -#endif - - #include "dev/flash.h" #include "dev/watchdog.h" diff --git a/cpu/msp430/leds-arch.c b/cpu/msp430/leds-arch.c index c193fbe82..e53a9bb17 100644 --- a/cpu/msp430/leds-arch.c +++ b/cpu/msp430/leds-arch.c @@ -40,12 +40,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - #include "dev/leds.h" /*---------------------------------------------------------------------------*/ diff --git a/cpu/msp430/minileds.c b/cpu/msp430/minileds.c index 76481d0b2..0a68ea88d 100644 --- a/cpu/msp430/minileds.c +++ b/cpu/msp430/minileds.c @@ -38,10 +38,7 @@ * (820 bytes on a msp430). */ -#include - #include "contiki.h" - #include "dev/leds.h" void diff --git a/cpu/msp430/msp430.c b/cpu/msp430/msp430.c index 7ea736bd6..793defc35 100644 --- a/cpu/msp430/msp430.c +++ b/cpu/msp430/msp430.c @@ -31,14 +31,6 @@ * @(#)$Id: msp430.c,v 1.15 2011/01/05 13:36:38 joxe Exp $ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#include -#define asmv(arg) __asm__ __volatile__(arg) -#endif #include "dev/watchdog.h" #include "net/uip.h" @@ -232,8 +224,8 @@ msp430_cpu_init(void) } /*---------------------------------------------------------------------------*/ -# #define STACK_EXTRA 32 +#define asmv(arg) __asm__ __volatile__(arg) /* * Allocate memory from the heap. Check that we don't collide with the diff --git a/cpu/msp430/msp430def.h b/cpu/msp430/msp430def.h index 86b8e9f86..f869241c6 100644 --- a/cpu/msp430/msp430def.h +++ b/cpu/msp430/msp430def.h @@ -32,6 +32,30 @@ #ifndef MSP430DEF_H #define MSP430DEF_H +#if defined(__IAR_SYSTEMS_ICC__) || defined(__MSPGCC__) +#include +#if __MSPGCC__ +#include +#endif /* __MSPGCC__ */ +#else +#include +#include +#endif + +#ifdef __IAR_SYSTEMS_ICC__ +#include +#include +#define dint() __disable_interrupt() +#define eint() __enable_interrupt() +#define __MSP430F1611__ 1 +#define __MSP430__ 1 +#define CC_CONF_INLINE +#define BV(x) (1 << x) +#else +#define CC_CONF_INLINE inline +#define MSP430_MEMCPY_WORKAROUND 1 +#endif + #ifdef HAVE_STDINT_H #include #else diff --git a/cpu/msp430/rom.c b/cpu/msp430/rom.c index f9384e733..c45faeb41 100644 --- a/cpu/msp430/rom.c +++ b/cpu/msp430/rom.c @@ -29,8 +29,6 @@ * @(#)$Id: rom.c,v 1.2 2006/12/01 15:06:42 bg- Exp $ */ -#include - #include "contiki.h" #include "dev/rom.h" diff --git a/cpu/msp430/rtimer-arch.c b/cpu/msp430/rtimer-arch.c index 2b5820573..fab65e418 100644 --- a/cpu/msp430/rtimer-arch.c +++ b/cpu/msp430/rtimer-arch.c @@ -40,15 +40,6 @@ #include "contiki.h" -#ifdef __GNUC__ -#include -#include -#endif - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#endif - #include "sys/energest.h" #include "sys/rtimer.h" #include "sys/process.h" diff --git a/cpu/msp430/slip_uart0.c b/cpu/msp430/slip_uart0.c index 3b4721e92..81c086b16 100644 --- a/cpu/msp430/slip_uart0.c +++ b/cpu/msp430/slip_uart0.c @@ -34,14 +34,6 @@ */ #include "contiki-conf.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "dev/slip.h" #include "dev/uart0.h" /*---------------------------------------------------------------------------*/ diff --git a/cpu/msp430/slip_uart1.c b/cpu/msp430/slip_uart1.c index 1a1ec519b..615488e08 100644 --- a/cpu/msp430/slip_uart1.c +++ b/cpu/msp430/slip_uart1.c @@ -34,12 +34,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif #include "dev/slip.h" #include "dev/uart1.h" /*---------------------------------------------------------------------------*/ diff --git a/cpu/msp430/spi.c b/cpu/msp430/spi.c index 0e59a6993..a88f69a57 100644 --- a/cpu/msp430/spi.c +++ b/cpu/msp430/spi.c @@ -31,13 +31,6 @@ #include "contiki-conf.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - - /* * On the Tmote sky access to I2C/SPI/UART0 must always be * exclusive. Set spi_busy so that interrupt handlers can check if diff --git a/cpu/msp430/spix.c b/cpu/msp430/spix.c index b474af322..5e55d788b 100644 --- a/cpu/msp430/spix.c +++ b/cpu/msp430/spix.c @@ -30,13 +30,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - /* * This is SPI initialization code for the MSP430X architecture. * diff --git a/cpu/msp430/watchdog.c b/cpu/msp430/watchdog.c index 94a4ddcde..89e816fe0 100644 --- a/cpu/msp430/watchdog.c +++ b/cpu/msp430/watchdog.c @@ -32,12 +32,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif #include "dev/watchdog.h" static int counter = 0; diff --git a/platform/esb/Makefile.esb b/platform/esb/Makefile.esb index 034cb2acd..91759f980 100644 --- a/platform/esb/Makefile.esb +++ b/platform/esb/Makefile.esb @@ -25,6 +25,16 @@ ifdef WITH_CODEPROP WITH_UIP=1 endif +ifdef GCC +CFLAGS+=-Os -g +endif + +ifdef IAR +CFLAGS+=-e --vla -Ohz --multiplier=16s --core=430 --double=32 +CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430fn.h" $(CFLAGSWERROR) +endif + + ifdef WITH_UIP ifndef WITH_SLIP WITH_SLIP=1 diff --git a/platform/esb/contiki-conf.h b/platform/esb/contiki-conf.h index eb2e3bac1..15a17989c 100644 --- a/platform/esb/contiki-conf.h +++ b/platform/esb/contiki-conf.h @@ -11,10 +11,20 @@ #define PROFILE_CONF_ON 0 #define ENERGEST_CONF_ON 1 -#define HAVE_STDINT_H +#ifdef __IAR_SYSTEMS_ICC__ +#define __MSP430F149__ 1 +#define __MSP430__ 1 +#define CC_CONF_INLINE +#define BV(x) (1 << x) +#else +#define CC_CONF_INLINE inline #define MSP430_MEMCPY_WORKAROUND 1 +#endif + +#define HAVE_STDINT_H #include "msp430def.h" + #define PROCESS_CONF_NUMEVENTS 8 #define PROCESS_CONF_STATS 0 @@ -31,8 +41,6 @@ #define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1 -#define CC_CONF_INLINE inline - #define CC_CONF_VA_ARGS 1 #define CCIF diff --git a/platform/esb/contiki-esb-main.c b/platform/esb/contiki-esb-main.c index c184c21ae..8267c0738 100644 --- a/platform/esb/contiki-esb-main.c +++ b/platform/esb/contiki-esb-main.c @@ -31,8 +31,6 @@ * @(#)$Id: contiki-esb-main.c,v 1.19 2010/06/21 15:15:12 nifi Exp $ */ -#include -#include #include #include diff --git a/platform/esb/dev/battery-sensor.c b/platform/esb/dev/battery-sensor.c index 96809fd6e..09a15543a 100644 --- a/platform/esb/dev/battery-sensor.c +++ b/platform/esb/dev/battery-sensor.c @@ -36,8 +36,8 @@ * $Revision: 1.6 $ */ +#include "contiki.h" #include "dev/battery-sensor.h" -#include #include "dev/irq.h" const struct sensors_sensor battery_sensor; diff --git a/platform/esb/dev/beep.c b/platform/esb/dev/beep.c index 91a81114b..b5b6e6f8b 100644 --- a/platform/esb/dev/beep.c +++ b/platform/esb/dev/beep.c @@ -31,8 +31,7 @@ * @(#)$Id: beep.c,v 1.4 2006/07/07 06:36:38 nifi Exp $ */ -#include - +#include "contiki.h" #include "contiki-esb.h" #define ON 1 diff --git a/platform/esb/dev/ds1629.c b/platform/esb/dev/ds1629.c index 926a7c8d4..3950d7678 100644 --- a/platform/esb/dev/ds1629.c +++ b/platform/esb/dev/ds1629.c @@ -46,9 +46,8 @@ Berlin, 2005 * reformatted to fit the Contiki ESB port. */ -#include "contiki-conf.h" +#include "contiki.h" #include "dev/ds1629.h" -#include #define SDA_HIGH (P5OUT |= 0x01) /* RTC data line high */ #define SDA_LOW (P5OUT &= 0xFE) /* RTC data line low */ diff --git a/platform/esb/dev/eeprom.c b/platform/esb/dev/eeprom.c index 3e264064b..e7d20d7f9 100644 --- a/platform/esb/dev/eeprom.c +++ b/platform/esb/dev/eeprom.c @@ -78,8 +78,8 @@ scatterweb@lists.spline.inf.fu-berlin.de (subscription via the Website). Berlin, 2003/2004 */ -#include -#include +#include "contiki.h" +/* #include */ #include "dev/eeprom.h" diff --git a/platform/esb/dev/ir.c b/platform/esb/dev/ir.c index 3c1d4313d..11bede1fa 100644 --- a/platform/esb/dev/ir.c +++ b/platform/esb/dev/ir.c @@ -73,9 +73,7 @@ Contributors: Thomas Pietsch, Bjoern Lichtblau ** \endcode **/ -#include -#include - +#include "contiki.h" #include "dev/ir.h" #include "dev/leds.h" diff --git a/platform/esb/dev/irq.c b/platform/esb/dev/irq.c index d9efdd084..d16d4de87 100644 --- a/platform/esb/dev/irq.c +++ b/platform/esb/dev/irq.c @@ -30,11 +30,10 @@ * * @(#)$Id: irq.c,v 1.4 2010/01/14 17:39:35 nifi Exp $ */ +#include "contiki.h" #include "lib/sensors.h" #include "dev/irq.h" #include "dev/lpm.h" -#include -#include #define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno] diff --git a/platform/esb/dev/radio-sensor.c b/platform/esb/dev/radio-sensor.c index b13c7b345..351a6f65a 100644 --- a/platform/esb/dev/radio-sensor.c +++ b/platform/esb/dev/radio-sensor.c @@ -31,10 +31,10 @@ * @(#)$Id: radio-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $ */ +#include "contiki.h" #include "dev/radio-sensor.h" #include "dev/irq.h" #include "dev/tr1001.h" -#include const struct sensors_sensor radio_sensor; diff --git a/platform/esb/dev/rs232.c b/platform/esb/dev/rs232.c index e3ace29cb..79c9d737b 100644 --- a/platform/esb/dev/rs232.c +++ b/platform/esb/dev/rs232.c @@ -43,8 +43,7 @@ * */ -#include -#include +#include "contiki.h" #include #include "contiki-esb.h" diff --git a/platform/esb/dev/sound-sensor.c b/platform/esb/dev/sound-sensor.c index 309f2d9cb..5fc2fa822 100644 --- a/platform/esb/dev/sound-sensor.c +++ b/platform/esb/dev/sound-sensor.c @@ -30,10 +30,10 @@ * * @(#)$Id: sound-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $ */ +#include "contiki.h" #include "dev/sound-sensor.h" #include "dev/irq.h" #include -#include #define MIC_MIN_SENS 150 #define SAMPLE 1 diff --git a/platform/esb/dev/tr1001-gcr.c b/platform/esb/dev/tr1001-gcr.c index d2c2a58d8..744d6b358 100644 --- a/platform/esb/dev/tr1001-gcr.c +++ b/platform/esb/dev/tr1001-gcr.c @@ -50,6 +50,7 @@ * */ +#include "contiki.h" #include "contiki-esb.h" #include "dev/tr1001.h" @@ -59,8 +60,6 @@ #include "net/netstack.h" #include "net/rime/rimestats.h" -#include -#include #include #ifdef TR1001_CONF_BEEP_ON_BAD_CRC diff --git a/platform/esb/dev/tr1001.c b/platform/esb/dev/tr1001.c index 35c24413c..13cfe42bd 100644 --- a/platform/esb/dev/tr1001.c +++ b/platform/esb/dev/tr1001.c @@ -50,6 +50,7 @@ * */ +#include "contiki.h" #include "contiki-esb.h" #include "dev/tr1001.h" @@ -59,8 +60,6 @@ #include "net/netstack.h" #include "net/rime/rimestats.h" -#include -#include #include #ifdef TR1001_CONF_BEEP_ON_BAD_CRC diff --git a/platform/jcreate/dev/acc-sensor.c b/platform/jcreate/dev/acc-sensor.c index f92fc64a0..b845cb373 100644 --- a/platform/jcreate/dev/acc-sensor.c +++ b/platform/jcreate/dev/acc-sensor.c @@ -36,9 +36,9 @@ * $Revision: 1.2 $ */ +#include "contiki.h" #include "dev/acc-sensor.h" #include "dev/sky-sensors.h" -#include /* Configure ADC12_2 to sample channel 4, 5, 6 and use */ /* the Vref+ as reference (SREF_1) since it is a stable reference */ diff --git a/platform/jcreate/dev/ext-sensor.c b/platform/jcreate/dev/ext-sensor.c index f40438aca..58524dc49 100644 --- a/platform/jcreate/dev/ext-sensor.c +++ b/platform/jcreate/dev/ext-sensor.c @@ -37,8 +37,8 @@ * $Revision: 1.2 $ */ -#include +#include "contiki.h" #include "dev/ext-sensor.h" #include "dev/sky-sensors.h" diff --git a/platform/jcreate/leds-arch.c b/platform/jcreate/leds-arch.c index 2bfd6fd85..d8ff39406 100644 --- a/platform/jcreate/leds-arch.c +++ b/platform/jcreate/leds-arch.c @@ -38,11 +38,9 @@ * Joakim Eriksson */ -#include "contiki-conf.h" +#include "contiki.h" #include "dev/leds.h" -#include - /*---------------------------------------------------------------------------*/ void leds_arch_init(void) diff --git a/platform/msb430/contiki-msb430-main.c b/platform/msb430/contiki-msb430-main.c index 9bb5db7cb..8b6b4f187 100644 --- a/platform/msb430/contiki-msb430-main.c +++ b/platform/msb430/contiki-msb430-main.c @@ -36,10 +36,6 @@ * \author * Michael Baar , Nicolas Tsiftes */ - -#include -#include - #include #include diff --git a/platform/msb430/dev/adc.c b/platform/msb430/dev/adc.c index f29a642a2..18b1ebdfa 100644 --- a/platform/msb430/dev/adc.c +++ b/platform/msb430/dev/adc.c @@ -37,8 +37,7 @@ * Nicolas Tsiftes */ -#include -#include +#include "contiki.h" #include #include "contiki-msb430.h" diff --git a/platform/msb430/dev/dma.c b/platform/msb430/dev/dma.c index 11bf7c46d..811416e76 100644 --- a/platform/msb430/dev/dma.c +++ b/platform/msb430/dev/dma.c @@ -36,9 +36,7 @@ * \author * Nicolas Tsiftes */ - -#include -#include +#include "contiki.h" #include "contiki-msb430.h" #include "dev/cc1020.h" diff --git a/platform/msb430/dev/msb430-uart1.c b/platform/msb430/dev/msb430-uart1.c index efe2cdecc..997648931 100644 --- a/platform/msb430/dev/msb430-uart1.c +++ b/platform/msb430/dev/msb430-uart1.c @@ -52,8 +52,6 @@ Berlin, 2007 */ #include "contiki.h" -#include -#include #include #include "dev/msb430-uart1.h" #include "dev/lpm.h" diff --git a/platform/msb430/dev/rs232.c b/platform/msb430/dev/rs232.c index 53ac55f0d..75f711eb6 100644 --- a/platform/msb430/dev/rs232.c +++ b/platform/msb430/dev/rs232.c @@ -42,9 +42,7 @@ * This file contains an RS232 device driver for the MSP430 microcontroller. * */ - -#include -#include +#include "contiki.h" #include #include "dev/msb430-uart1.h" #include "rs232.h" diff --git a/platform/msb430/dev/sd-arch.c b/platform/msb430/dev/sd-arch.c index c3a2d8160..02f5666f0 100644 --- a/platform/msb430/dev/sd-arch.c +++ b/platform/msb430/dev/sd-arch.c @@ -40,7 +40,6 @@ #include "contiki.h" #include "msb430-uart1.h" #include "sd-arch.h" -#include #define SPI_IDLE 0xff diff --git a/platform/msb430/dev/sd.c b/platform/msb430/dev/sd.c index 408659642..b1ef4c21b 100644 --- a/platform/msb430/dev/sd.c +++ b/platform/msb430/dev/sd.c @@ -41,7 +41,6 @@ #include "sd.h" #include "sd-arch.h" -#include #include #define DEBUG 0 diff --git a/platform/sky/checkpoint-arch.c b/platform/sky/checkpoint-arch.c index dc6ef445d..8fa5a7f39 100644 --- a/platform/sky/checkpoint-arch.c +++ b/platform/sky/checkpoint-arch.c @@ -55,13 +55,6 @@ #include "dev/button-sensor.h" #include "cfs/cfs.h" #include "cfs/cfs-coffee.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif #include #define DEBUG 0 diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index f4a5ceab3..f7f847df1 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -32,14 +32,6 @@ #include #include #include "contiki.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "dev/cc2420.h" #include "dev/ds2411.h" #include "dev/leds.h" diff --git a/platform/sky/dev/battery-sensor.c b/platform/sky/dev/battery-sensor.c index f2662e5ef..5c733bd5a 100644 --- a/platform/sky/dev/battery-sensor.c +++ b/platform/sky/dev/battery-sensor.c @@ -39,11 +39,6 @@ #include "contiki.h" #include "dev/battery-sensor.h" #include "dev/sky-sensors.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif /* Configure ADC12_2 to sample channel 11 (voltage) and use */ /* the Vref+ as reference (SREF_1) since it is a stable reference */ diff --git a/platform/sky/dev/button-sensor.c b/platform/sky/dev/button-sensor.c index 57e974980..30a281eb0 100644 --- a/platform/sky/dev/button-sensor.c +++ b/platform/sky/dev/button-sensor.c @@ -30,16 +30,11 @@ * * @(#)$Id: button-sensor.c,v 1.4 2010/01/14 20:01:19 nifi Exp $ */ +#include "contiki.h" #include "lib/sensors.h" #include "dev/hwconf.h" #include "dev/button-sensor.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - const struct sensors_sensor button_sensor; static struct timer debouncetimer; diff --git a/platform/sky/dev/i2c.c b/platform/sky/dev/i2c.c index da1afbc1d..c0997187e 100644 --- a/platform/sky/dev/i2c.c +++ b/platform/sky/dev/i2c.c @@ -42,13 +42,6 @@ #include #include - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - #include #include diff --git a/platform/sky/dev/light-sensor.c b/platform/sky/dev/light-sensor.c index 493076f54..4e17b6051 100644 --- a/platform/sky/dev/light-sensor.c +++ b/platform/sky/dev/light-sensor.c @@ -36,12 +36,6 @@ #include "dev/sky-sensors.h" #include "dev/light-sensor.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - /* Photodiode 1 (P64) on INCH_4 */ /* Photodiode 2 (P65) on INCH_5 */ #define INPUT_CHANNEL ((1 << INCH_4) | (1 << INCH_5)) diff --git a/platform/sky/dev/light.c b/platform/sky/dev/light.c index 7d6192b0f..0e8fd1abb 100644 --- a/platform/sky/dev/light.c +++ b/platform/sky/dev/light.c @@ -32,9 +32,6 @@ */ #include - -#include - #include "contiki.h" #include "dev/light.h" diff --git a/platform/sky/dev/sky-sensors.c b/platform/sky/dev/sky-sensors.c index 97d8ced26..e598b2ad1 100644 --- a/platform/sky/dev/sky-sensors.c +++ b/platform/sky/dev/sky-sensors.c @@ -38,12 +38,6 @@ * $Revision: 1.3 $ */ #include "contiki.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif #include "lib/sensors.h" #define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno] diff --git a/platform/sky/dev/temperature-sensor.c b/platform/sky/dev/temperature-sensor.c index 6b1899b07..09943f0a3 100644 --- a/platform/sky/dev/temperature-sensor.c +++ b/platform/sky/dev/temperature-sensor.c @@ -38,9 +38,9 @@ * Niclas Finne */ +#include "contiki.h" #include "dev/temperature-sensor.h" #include "dev/sky-sensors.h" -#include #define INPUT_CHANNEL (1 << INCH_10) #define INPUT_REFERENCE SREF_1 diff --git a/platform/sky/dev/xmem.c b/platform/sky/dev/xmem.c index 1ce480d1d..ad9eda96b 100644 --- a/platform/sky/dev/xmem.c +++ b/platform/sky/dev/xmem.c @@ -44,14 +44,6 @@ #include #include -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - - #include "dev/spi.h" #include "dev/xmem.h" #include "dev/watchdog.h" diff --git a/platform/sky/platform-conf.h b/platform/sky/platform-conf.h index b0d50f323..ee08f4b23 100644 --- a/platform/sky/platform-conf.h +++ b/platform/sky/platform-conf.h @@ -51,10 +51,6 @@ #define PLATFORM_HAS_BUTTON 1 #ifdef __IAR_SYSTEMS_ICC__ -#include -#include -#define dint() __disable_interrupt() -#define eint() __enable_interrupt() #define __MSP430F1611__ 1 #define __MSP430__ 1 #define CC_CONF_INLINE diff --git a/platform/z1/checkpoint-arch.c b/platform/z1/checkpoint-arch.c index f96376bd9..f9fff0324 100644 --- a/platform/z1/checkpoint-arch.c +++ b/platform/z1/checkpoint-arch.c @@ -46,15 +46,6 @@ #include "cfs/cfs-coffee.h" #include "dev/leds.h" #include "dev/watchdog.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - - #include #define DEBUG 1 diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index 20c02e9f1..a8bcc0aa1 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -34,13 +34,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "dev/cc2420.h" #include "dev/leds.h" #include "dev/serial-line.h" diff --git a/platform/z1/dev/battery-sensor.c b/platform/z1/dev/battery-sensor.c index 31182d37f..0ad412a49 100644 --- a/platform/z1/dev/battery-sensor.c +++ b/platform/z1/dev/battery-sensor.c @@ -39,13 +39,6 @@ #include "dev/battery-sensor.h" #include "dev/sky-sensors.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif - - /* Configure ADC12_2 to sample channel 11 (voltage) and use */ /* the Vref+ as reference (SREF_1) since it is a stable reference */ #define INPUT_CHANNEL (1 << INCH_11) diff --git a/platform/z1/dev/button-sensor.c b/platform/z1/dev/button-sensor.c index 1d824fc58..bea5b3669 100644 --- a/platform/z1/dev/button-sensor.c +++ b/platform/z1/dev/button-sensor.c @@ -32,13 +32,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "lib/sensors.h" #include "dev/hwconf.h" #include "dev/button-sensor.h" diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c index 7e3529cdf..5fcfa07b4 100644 --- a/platform/z1/dev/cc2420-arch.c +++ b/platform/z1/dev/cc2420-arch.c @@ -31,15 +31,6 @@ #include "contiki.h" #include "contiki-net.h" - -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - - #include "dev/spi.h" #include "dev/cc2420.h" diff --git a/platform/z1/dev/i2cmaster.h b/platform/z1/dev/i2cmaster.h index 86ae82ef9..2f11e1067 100644 --- a/platform/z1/dev/i2cmaster.h +++ b/platform/z1/dev/i2cmaster.h @@ -43,12 +43,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif #include #include diff --git a/platform/z1/dev/light-sensor.c b/platform/z1/dev/light-sensor.c index d4ab0a883..3c10ae156 100644 --- a/platform/z1/dev/light-sensor.c +++ b/platform/z1/dev/light-sensor.c @@ -32,13 +32,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "lib/sensors.h" #include "dev/sky-sensors.h" #include "dev/light-sensor.h" diff --git a/platform/z1/dev/light.c b/platform/z1/dev/light.c index 237546e98..7d739e86f 100644 --- a/platform/z1/dev/light.c +++ b/platform/z1/dev/light.c @@ -39,15 +39,7 @@ */ #include - #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "dev/light.h" /* diff --git a/platform/z1/dev/potentiometer-sensor.c b/platform/z1/dev/potentiometer-sensor.c index 660cb7f65..12597bd0e 100644 --- a/platform/z1/dev/potentiometer-sensor.c +++ b/platform/z1/dev/potentiometer-sensor.c @@ -36,15 +36,7 @@ #include "dev/potentiometer-sensor.h" #include "dev/sky-sensors.h" - #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - /* Configure ADC12_2 to sample channel 11 (voltage) and use */ /* the Vref+ as reference (SREF_1) since it is a stable reference */ diff --git a/platform/z1/dev/sky-sensors.c b/platform/z1/dev/sky-sensors.c index f3523a86a..e598b2ad1 100644 --- a/platform/z1/dev/sky-sensors.c +++ b/platform/z1/dev/sky-sensors.c @@ -39,11 +39,6 @@ */ #include "contiki.h" #include "lib/sensors.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#endif #define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno] diff --git a/platform/z1/dev/temperature-sensor.c b/platform/z1/dev/temperature-sensor.c index bf38f9709..78bb7a6ad 100644 --- a/platform/z1/dev/temperature-sensor.c +++ b/platform/z1/dev/temperature-sensor.c @@ -40,14 +40,7 @@ #include "dev/temperature-sensor.h" #include "dev/sky-sensors.h" - #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif #define INPUT_CHANNEL (1 << INCH_10) #define INPUT_REFERENCE SREF_1 diff --git a/platform/z1/dev/tmp102.c b/platform/z1/dev/tmp102.c index baf820359..724cf57a5 100644 --- a/platform/z1/dev/tmp102.c +++ b/platform/z1/dev/tmp102.c @@ -41,13 +41,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "i2cmaster.h" #include "tmp102.h" diff --git a/platform/z1/dev/xmem.c b/platform/z1/dev/xmem.c index 433ccd2f1..f2bd1632b 100644 --- a/platform/z1/dev/xmem.c +++ b/platform/z1/dev/xmem.c @@ -44,13 +44,6 @@ #include #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "dev/spi.h" #include "dev/xmem.h" #include "dev/watchdog.h" diff --git a/platform/z1/dev/z1-phidgets.c b/platform/z1/dev/z1-phidgets.c index 5a3412062..2ebdd1dbb 100644 --- a/platform/z1/dev/z1-phidgets.c +++ b/platform/z1/dev/z1-phidgets.c @@ -39,13 +39,6 @@ */ #include "contiki.h" -#ifdef __IAR_SYSTEMS_ICC__ -#include -#else -#include -#include -#endif - #include "lib/sensors.h" #include "dev/z1-phidgets.h" diff --git a/platform/z1sp/dev/potentiometer-sensor.c b/platform/z1sp/dev/potentiometer-sensor.c index 107b400ba..ccfc1e851 100644 --- a/platform/z1sp/dev/potentiometer-sensor.c +++ b/platform/z1sp/dev/potentiometer-sensor.c @@ -34,9 +34,9 @@ * $Revision: 1.0 $ */ +#include "contiki.h" #include "dev/potentiometer-sensor.h" #include "dev/sky-sensors.h" -#include /* Configure ADC12_2 to sample channel 11 (voltage) and use */ /* the Vref+ as reference (SREF_1) since it is a stable reference */