deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

moved io and signal and IAR-GCC checks from driver files into contiki include file

Browse source
This commit is contained in:
Joakim Eriksson 2011-09-26 10:38:41 +02:00
parent 57ae779373
commit 5b1d9617c4
76 changed files with 72 additions and 370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/dev/cc2420-aes.c
View file

@ -39,12 +39,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/cc2420.h"
#include "dev/cc2420-aes.h"
#include "dev/spi.h"

6
core/dev/cc2420.c
View file

@ -40,12 +40,6 @@
#if defined(__AVR__)
#include <avr/io.h>
#elif defined(__MSP430__)
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#endif
#endif
#include "dev/leds.h"

6
core/dev/ds2411.c
View file

@ -51,12 +51,6 @@
#include <string.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#endif
#include "dev/ds2411.h"
unsigned char ds2411_id[8];

7
core/dev/sht11-sensor.c
View file

@ -34,13 +34,6 @@
#include <stdlib.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "lib/sensors.h"
#include "dev/sht11.h"
#include "dev/sht11-sensor.h"

8
core/dev/sht11.c
View file

@ -36,14 +36,6 @@
#include "contiki.h"
#include <stdio.h>
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include <dev/sht11.h>
#include "sht11-arch.h"

4
cpu/msp430/Makefile.msp430
View file

@ -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

4
cpu/msp430/button.c
View file

@ -29,11 +29,7 @@
* @(#)$Id: button.c,v 1.2 2006/08/17 15:41:13 bg- Exp $
*/
#include <io.h>
#include <signal.h>
#include "contiki.h"
#include "dev/button.h"
#define BUTTON_PORT 2

7
cpu/msp430/cc2420-arch-sfd.c
View file

@ -30,13 +30,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/spi.h"
#include "dev/cc2420.h"

8
cpu/msp430/cc2420-arch.c
View file

@ -30,14 +30,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "contiki-net.h"
#include "dev/spi.h"

7
cpu/msp430/clock.c
View file

@ -33,13 +33,6 @@
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "sys/energest.h"
#include "sys/clock.h"
#include "sys/etimer.h"

11
cpu/msp430/dev/hwconf.h
View file

@ -32,18 +32,9 @@
*/
#ifndef __HWCONF_H__
#define __HWCONF_H__
#include "contiki.h"
#include "sys/cc.h"
#ifdef __GNUC__
#include <io.h>
#include <signal.h>
#endif
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#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);} \

7
cpu/msp430/dev/uart0x.c
View file

@ -36,13 +36,6 @@
#include <stdlib.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "sys/energest.h"
#include "dev/uart0.h"
#include "dev/watchdog.h"

8
cpu/msp430/dev/uart1.c
View file

@ -35,14 +35,6 @@
#include <stdlib.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include <stdio.h>
#include "sys/energest.h"
#include "dev/uart1.h"
#include "dev/watchdog.h"

5
cpu/msp430/dev/uart1x.c
View file

@ -32,11 +32,8 @@
/*
* Machine dependent MSP430X UART1 code.
*/
#include "contiki.h"
#include <stdlib.h>
#include <io.h>
#include <signal.h>
#include "sys/energest.h"
#include "dev/uart1.h"
#include "dev/watchdog.h"

9
cpu/msp430/flash.c
View file

@ -36,15 +36,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <stdlib.h>
#include <io.h>
#include <signal.h>
#endif
#include "dev/flash.h"
#include "dev/watchdog.h"

6
cpu/msp430/leds-arch.c
View file

@ -40,12 +40,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#endif
#include "dev/leds.h"
/*---------------------------------------------------------------------------*/

3
cpu/msp430/minileds.c
View file

@ -38,10 +38,7 @@
* (820 bytes on a msp430).
*/
#include <io.h>
#include "contiki.h"
#include "dev/leds.h"
void

10
cpu/msp430/msp430.c
View file

@ -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 <msp430.h>
#else
#include <io.h>
#include <signal.h>
#include <sys/unistd.h>
#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

24
cpu/msp430/msp430def.h
View file

@ -32,6 +32,30 @@
#ifndef MSP430DEF_H
#define MSP430DEF_H
#if defined(__IAR_SYSTEMS_ICC__) || defined(__MSPGCC__)
#include <msp430.h>
#if __MSPGCC__
#include <legacymsp430.h>
#endif /* __MSPGCC__ */
#else
#include <io.h>
#include <signal.h>
#endif
#ifdef __IAR_SYSTEMS_ICC__
#include <intrinsics.h>
#include <in430.h>
#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 <stdint.h>
#else

2
cpu/msp430/rom.c
View file

@ -29,8 +29,6 @@
* @(#)$Id: rom.c,v 1.2 2006/12/01 15:06:42 bg- Exp $
*/
#include <io.h>
#include "contiki.h"
#include "dev/rom.h"

9
cpu/msp430/rtimer-arch.c
View file

@ -40,15 +40,6 @@
#include "contiki.h"
#ifdef __GNUC__
#include <io.h>
#include <signal.h>
#endif
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#endif
#include "sys/energest.h"
#include "sys/rtimer.h"
#include "sys/process.h"

8
cpu/msp430/slip_uart0.c
View file

@ -34,14 +34,6 @@
*/
#include "contiki-conf.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/slip.h"
#include "dev/uart0.h"
/*---------------------------------------------------------------------------*/

6
cpu/msp430/slip_uart1.c
View file

@ -34,12 +34,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/slip.h"
#include "dev/uart1.h"
/*---------------------------------------------------------------------------*/

7
cpu/msp430/spi.c
View file

@ -31,13 +31,6 @@
#include "contiki-conf.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#endif
/*
* On the Tmote sky access to I2C/SPI/UART0 must always be
* exclusive. Set spi_busy so that interrupt handlers can check if

7
cpu/msp430/spix.c
View file

@ -30,13 +30,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
/*
* This is SPI initialization code for the MSP430X architecture.
*

6
cpu/msp430/watchdog.c
View file

@ -32,12 +32,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/watchdog.h"
static int counter = 0;

10
platform/esb/Makefile.esb
View file

@ -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

14
platform/esb/contiki-conf.h
View file

@ -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

2
platform/esb/contiki-esb-main.c
View file

@ -31,8 +31,6 @@
* @(#)$Id: contiki-esb-main.c,v 1.19 2010/06/21 15:15:12 nifi Exp $
*/
#include <io.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>

2
platform/esb/dev/battery-sensor.c
View file

@ -36,8 +36,8 @@
* $Revision: 1.6 $
*/
#include "contiki.h"
#include "dev/battery-sensor.h"
#include <io.h>
#include "dev/irq.h"
const struct sensors_sensor battery_sensor;

3
platform/esb/dev/beep.c
View file

@ -31,8 +31,7 @@
* @(#)$Id: beep.c,v 1.4 2006/07/07 06:36:38 nifi Exp $
*/
#include <io.h>
#include "contiki.h"
#include "contiki-esb.h"
#define ON 1

3
platform/esb/dev/ds1629.c
View file

@ -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 <io.h>
#define SDA_HIGH (P5OUT |= 0x01) /* RTC data line high */
#define SDA_LOW (P5OUT &= 0xFE) /* RTC data line low */

4
platform/esb/dev/eeprom.c
View file

@ -78,8 +78,8 @@ scatterweb@lists.spline.inf.fu-berlin.de (subscription via the Website).
Berlin, 2003/2004
*/
#include <msp430x14x.h>
#include <io.h>
#include "contiki.h"
/* #include <msp430x14x.h> */
#include "dev/eeprom.h"

4
platform/esb/dev/ir.c
View file

@ -73,9 +73,7 @@ Contributors: Thomas Pietsch, Bjoern Lichtblau
** \endcode
**/
#include <io.h>
#include <signal.h>
#include "contiki.h"
#include "dev/ir.h"
#include "dev/leds.h"

3
platform/esb/dev/irq.c
View file

@ -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 <io.h>
#include <signal.h>
#define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno]

2
platform/esb/dev/radio-sensor.c
View file

@ -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 <io.h>
const struct sensors_sensor radio_sensor;

3
platform/esb/dev/rs232.c
View file

@ -43,8 +43,7 @@
*
*/
#include <io.h>
#include <signal.h>
#include "contiki.h"
#include <string.h>
#include "contiki-esb.h"

2
platform/esb/dev/sound-sensor.c
View file

@ -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 <stdlib.h>
#include <io.h>
#define MIC_MIN_SENS 150
#define SAMPLE 1

3
platform/esb/dev/tr1001-gcr.c
View file

@ -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 <io.h>
#include <signal.h>
#include <string.h>
#ifdef TR1001_CONF_BEEP_ON_BAD_CRC

3
platform/esb/dev/tr1001.c
View file

@ -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 <io.h>
#include <signal.h>
#include <string.h>
#ifdef TR1001_CONF_BEEP_ON_BAD_CRC

2
platform/jcreate/dev/acc-sensor.c
View file

@ -36,9 +36,9 @@
* $Revision: 1.2 $
*/
#include "contiki.h"
#include "dev/acc-sensor.h"
#include "dev/sky-sensors.h"
#include <io.h>
/* Configure ADC12_2 to sample channel 4, 5, 6 and use */
/* the Vref+ as reference (SREF_1) since it is a stable reference */

2
platform/jcreate/dev/ext-sensor.c
View file

@ -37,8 +37,8 @@
* $Revision: 1.2 $
*/
#include <io.h>
#include "contiki.h"
#include "dev/ext-sensor.h"
#include "dev/sky-sensors.h"

4
platform/jcreate/leds-arch.c
View file

@ -38,11 +38,9 @@
* Joakim Eriksson <joakime@sics.se>
*/
#include "contiki-conf.h"
#include "contiki.h"
#include "dev/leds.h"
#include <io.h>
/*---------------------------------------------------------------------------*/
void
leds_arch_init(void)

4
platform/msb430/contiki-msb430-main.c
View file

@ -36,10 +36,6 @@
* \author
* Michael Baar <baar@inf.fu-berlin.de>, Nicolas Tsiftes <nvt@sics.se>
*/
#include <io.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>

3
platform/msb430/dev/adc.c
View file

@ -37,8 +37,7 @@
* Nicolas Tsiftes <nvt@sics.se>
*/
#include <io.h>
#include <signal.h>
#include "contiki.h"
#include <msp430/adc12.h>
#include "contiki-msb430.h"

4
platform/msb430/dev/dma.c
View file

@ -36,9 +36,7 @@
* \author
* Nicolas Tsiftes <nvt@sics.se>
*/
#include <io.h>
#include <signal.h>
#include "contiki.h"
#include "contiki-msb430.h"
#include "dev/cc1020.h"

2
platform/msb430/dev/msb430-uart1.c
View file

@ -52,8 +52,6 @@ Berlin, 2007
*/
#include "contiki.h"
#include <io.h>
#include <signal.h>
#include <string.h>
#include "dev/msb430-uart1.h"
#include "dev/lpm.h"

4
platform/msb430/dev/rs232.c
View file

@ -42,9 +42,7 @@
* This file contains an RS232 device driver for the MSP430 microcontroller.
*
*/
#include <io.h>
#include <signal.h>
#include "contiki.h"
#include <string.h>
#include "dev/msb430-uart1.h"
#include "rs232.h"

1
platform/msb430/dev/sd-arch.c
View file

@ -40,7 +40,6 @@
#include "contiki.h"
#include "msb430-uart1.h"
#include "sd-arch.h"
#include <io.h>
#define SPI_IDLE 0xff

1
platform/msb430/dev/sd.c
View file

@ -41,7 +41,6 @@
#include "sd.h"
#include "sd-arch.h"
#include <io.h>
#include <string.h>
#define DEBUG 0

7
platform/sky/checkpoint-arch.c
View file

@ -55,13 +55,6 @@
#include "dev/button-sensor.h"
#include "cfs/cfs.h"
#include "cfs/cfs-coffee.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include <stdio.h>
#define DEBUG 0

8
platform/sky/contiki-sky-main.c
View file

@ -32,14 +32,6 @@
#include <stdio.h>
#include <string.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/cc2420.h"
#include "dev/ds2411.h"
#include "dev/leds.h"

5
platform/sky/dev/battery-sensor.c
View file

@ -39,11 +39,6 @@
#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 */

7
platform/sky/dev/button-sensor.c
View file

@ -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 <msp430.h>
#else
#include <signal.h>
#endif
const struct sensors_sensor button_sensor;
static struct timer debouncetimer;

7
platform/sky/dev/i2c.c
View file

@ -42,13 +42,6 @@
#include <stdio.h>
#include <contiki.h>
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#endif
#include <dev/spi.h>
#include <dev/leds.h>

6
platform/sky/dev/light-sensor.c
View file

@ -36,12 +36,6 @@
#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 */
#define INPUT_CHANNEL ((1 << INCH_4) | (1 << INCH_5))

3
platform/sky/dev/light.c
View file

@ -32,9 +32,6 @@
*/
#include <stdlib.h>
#include <io.h>
#include "contiki.h"
#include "dev/light.h"

6
platform/sky/dev/sky-sensors.c
View file

@ -38,12 +38,6 @@
* $Revision: 1.3 $
*/
#include "contiki.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]

2
platform/sky/dev/temperature-sensor.c
View file

@ -38,9 +38,9 @@
* Niclas Finne <nfi@sics.se>
*/
#include "contiki.h"
#include "dev/temperature-sensor.h"
#include "dev/sky-sensors.h"
#include <io.h>
#define INPUT_CHANNEL (1 << INCH_10)
#define INPUT_REFERENCE SREF_1

8
platform/sky/dev/xmem.c
View file

@ -44,14 +44,6 @@
#include <stdio.h>
#include <string.h>
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/spi.h"
#include "dev/xmem.h"
#include "dev/watchdog.h"

4
platform/sky/platform-conf.h
View file

@ -51,10 +51,6 @@
#define PLATFORM_HAS_BUTTON 1
#ifdef __IAR_SYSTEMS_ICC__
#include <intrinsics.h>
#include <in430.h>
#define dint() __disable_interrupt()
#define eint() __enable_interrupt()
#define __MSP430F1611__ 1
#define __MSP430__ 1
#define CC_CONF_INLINE

9
platform/z1/checkpoint-arch.c
View file

@ -46,15 +46,6 @@
#include "cfs/cfs-coffee.h"
#include "dev/leds.h"
#include "dev/watchdog.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include <stdio.h>
#define DEBUG 1

7
platform/z1/contiki-z1-main.c
View file

@ -34,13 +34,6 @@
#include <stdarg.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/cc2420.h"
#include "dev/leds.h"
#include "dev/serial-line.h"

7
platform/z1/dev/battery-sensor.c
View file

@ -39,13 +39,6 @@
#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 */
#define INPUT_CHANNEL (1 << INCH_11)

7
platform/z1/dev/button-sensor.c
View file

@ -32,13 +32,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "lib/sensors.h"
#include "dev/hwconf.h"
#include "dev/button-sensor.h"

9
platform/z1/dev/cc2420-arch.c
View file

@ -31,15 +31,6 @@
#include "contiki.h"
#include "contiki-net.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/spi.h"
#include "dev/cc2420.h"

6
platform/z1/dev/i2cmaster.h
View file

@ -43,12 +43,6 @@
#include <stdio.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include <dev/spi.h>
#include <dev/leds.h>

7
platform/z1/dev/light-sensor.c
View file

@ -32,13 +32,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "lib/sensors.h"
#include "dev/sky-sensors.h"
#include "dev/light-sensor.h"

8
platform/z1/dev/light.c
View file

@ -39,15 +39,7 @@
*/
#include <stdlib.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/light.h"
/*

8
platform/z1/dev/potentiometer-sensor.c
View file

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

5
platform/z1/dev/sky-sensors.c
View file

@ -39,11 +39,6 @@
*/
#include "contiki.h"
#include "lib/sensors.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#endif
#define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno]

7
platform/z1/dev/temperature-sensor.c
View file

@ -40,14 +40,7 @@
#include "dev/temperature-sensor.h"
#include "dev/sky-sensors.h"
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#define INPUT_CHANNEL (1 << INCH_10)
#define INPUT_REFERENCE SREF_1

7
platform/z1/dev/tmp102.c
View file

@ -41,13 +41,6 @@
#include <stdio.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "i2cmaster.h"
#include "tmp102.h"

7
platform/z1/dev/xmem.c
View file

@ -44,13 +44,6 @@
#include <string.h>
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "dev/spi.h"
#include "dev/xmem.h"
#include "dev/watchdog.h"

7
platform/z1/dev/z1-phidgets.c
View file

@ -39,13 +39,6 @@
*/
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
#include "lib/sensors.h"
#include "dev/z1-phidgets.h"

2
platform/z1sp/dev/potentiometer-sensor.c
View file

@ -34,9 +34,9 @@
* $Revision: 1.0 $
*/
#include "contiki.h"
#include "dev/potentiometer-sensor.h"
#include "dev/sky-sensors.h"
#include <io.h>
/* Configure ADC12_2 to sample channel 11 (voltage) and use */
/* the Vref+ as reference (SREF_1) since it is a stable reference */