fixed missing stdint includes for all platforms

* plus some minor include and prototype fixes for wsn430
RIOT-OS · Oct 29, 2013 · ec3234a · ec3234a
1 parent 61eff40
commit ec3234a
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 9 deletions.
diff --git a/avsextrem/include/board.h b/avsextrem/include/board.h
@@ -24,7 +24,7 @@
 #ifndef BOARDCONF_H_
 #define BOARDCONF_H_
 #include <bitarithm.h>
-
+#include "msba2-common.h"
 
 #define FEUERWARE_CONF_BOARD_NAME	      "FU Berlin AVSEXTREM BOARD"
 

diff --git a/chronos/include/board.h b/chronos/include/board.h
@@ -1,6 +1,7 @@
 #ifndef _MSB_BOARD_H
 #define _MSB_BOARD_H
 
+#include <stdint.h>
 #include <cc430f6137.h>
 
 #define MSP430_INITIAL_CPU_SPEED    7372800uL

diff --git a/msb-430-common/include/board-conf.h b/msb-430-common/include/board-conf.h
@@ -1,6 +1,8 @@
 #ifndef BOARD_CONF_H
 #define BOARD_CONF_H
 
+#include <stdint.h>
+
 #define INFOMEM     (0x1000)
 
 #endif /* BOARD-CONF_H */
diff --git a/msb-430/Makefile.include b/msb-430/Makefile.include
@@ -1 +1,2 @@
+export INCLUDES += -I$(RIOTBOARD)/msb-430h/include -I$(RIOTBOARD)/msb-430-common/include
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/msb-430/include/board.h b/msb-430/include/board.h
@@ -48,6 +48,8 @@ and the mailinglist (subscription via web site)
  * @note		$Id$
  */
 
+#include "board-conf.h"
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED 2457600uL
 #define MSP430_HAS_DCOR             1

diff --git a/msb-430h/include/board.h b/msb-430h/include/board.h
@@ -65,6 +65,7 @@ and the mailinglist (subscription via web site)
 #define LED_RED_TOGGLE     LEDS_PxOUT ^= LEDS_CONF_RED
 
 #include <msp430x16x.h>
+#include "board-conf.h"
 
 typedef uint8_t radio_packet_length_t;
 

diff --git a/msba2-common/include/msba2_common.h b/msba2-common/include/msba2_common.h
@@ -43,7 +43,8 @@ and the mailinglist (subscription via web site)
  * @note		$Id$
  */
 
-#include <lpc2387.h>
+#include <stdint.h>
+#include "lpc2387.h"
 
 #define VICIntEnClear VICIntEnClr
 

diff --git a/msba2/include/board.h b/msba2/include/board.h
@@ -1,8 +1,8 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#include <msba2_common.h>
-#include <bitarithm.h>
+#include "msba2_common.h"
+#include "bitarithm.h"
 
 #define LED_RED_PIN (BIT25)
 #define LED_GREEN_PIN (BIT26)

diff --git a/native/include/board.h b/native/include/board.h
@@ -15,6 +15,8 @@
  * @}
  */
 
+#include <stdint.h>
+
 void _native_LED_GREEN_OFF(void);
 #define LED_GREEN_OFF (_native_LED_GREEN_OFF())
 void _native_LED_GREEN_ON(void);

diff --git a/olimex_lpc2148/include/board.h b/olimex_lpc2148/include/board.h
@@ -1,3 +1,4 @@
-#include <lpc2148.h>
+#include <stdint.h>
+#include "lpc2148.h"
 
 typedef uint8_t radio_packet_length_t;
diff --git a/telosb/include/board.h b/telosb/include/board.h
@@ -52,6 +52,7 @@
 #define LED_BLUE_OFF     LEDS_PxOUT |= LEDS_CONF_BLUE
 #define LED_BLUE_TOGGLE     LEDS_PxOUT ^= LEDS_CONF_BLUE
 
+#include <stdint.h>
 #include <msp430x16x.h>
 
 typedef uint8_t radio_packet_length_t;

diff --git a/wsn430-common/Makefile.include b/wsn430-common/Makefile.include
@@ -20,6 +20,6 @@ endif
 export HEXFILE = bin/$(PROJECT).hex
 export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
 
-export INCLUDES += -I $(RIOTCPU)/msp430-common/include/
+export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBASE)/sys/net/ieee802154/include/
 export OFLAGS = -O ihex
 
diff --git a/wsn430-common/board_init.c b/wsn430-common/board_init.c
@@ -14,6 +14,8 @@
 
 volatile static uint32_t __msp430_cpu_speed = MSP430_INITIAL_CPU_SPEED;
 
+void msp430_init_dco(void);
+
 typedef enum {
     MCLK_2MHZ_SCLK_1MHZ = 1000002uL,
     MCLK_4MHZ_SCLK_1MHZ = 1000004uL,

diff --git a/wsn430-common/include/board-conf.h b/wsn430-common/include/board-conf.h
@@ -8,6 +8,8 @@
 #ifndef BOARD_CONF_H
 #define BOARD_CONF_H 
 
+#include <stdint.h>
+
 #define INFOMEM     (0x1000)
 
 #endif /* BOARD-CONF_H */
diff --git a/wsn430-v1_3b/Makefile.include b/wsn430-v1_3b/Makefile.include
@@ -1,3 +1,4 @@
+export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 
-include $(RIOTBOARD)/wsn430-common/Makefile.include
+include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/wsn430-v1_3b/include/board.h b/wsn430-v1_3b/include/board.h
@@ -31,6 +31,8 @@
  * @note		$Id$
  */
 
+#include "board-conf.h"
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED    800000uL
 #define MSP430_HAS_DCOR             0

diff --git a/wsn430-v1_4/Makefile b/wsn430-v1_4/Makefile
@@ -9,7 +9,6 @@ INCLUDES += -I${RIOTBASE}/core/include/
 INCLUDES += -Iinclude/ -I$(RIOTBOARD)/wsn430-common/include/
 INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/include/
 INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include/ -I$(RIOTBASE)/sys/include
-INCLUDES += -I$(RIOTBASE)/sys/net/
 
 all: $(BINDIR)$(ARCH)
 	$(MAKE) -C ../wsn430-common

diff --git a/wsn430-v1_4/Makefile.include b/wsn430-v1_4/Makefile.include
@@ -1,3 +1,4 @@
+export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 
-include $(RIOTBOARD)/wsn430-common/Makefile.include
+include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/wsn430-v1_4/include/board.h b/wsn430-v1_4/include/board.h
@@ -31,6 +31,8 @@
  * @note		$Id$
  */
 
+#include "board-conf.h"
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED    800000uL
 #define MSP430_HAS_DCOR             0