Skip to content
Snippets Groups Projects
Commit ec3234a8 authored by Oleg Hahm's avatar Oleg Hahm
Browse files

fixed missing stdint includes for all platforms

 * plus some minor include and prototype fixes for wsn430
parent 61eff404
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 9 deletions
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef BOARDCONF_H_ #ifndef BOARDCONF_H_
#define BOARDCONF_H_ #define BOARDCONF_H_
#include <bitarithm.h> #include <bitarithm.h>
#include "msba2-common.h"
#define FEUERWARE_CONF_BOARD_NAME "FU Berlin AVSEXTREM BOARD" #define FEUERWARE_CONF_BOARD_NAME "FU Berlin AVSEXTREM BOARD"
......
#ifndef _MSB_BOARD_H #ifndef _MSB_BOARD_H
#define _MSB_BOARD_H #define _MSB_BOARD_H
#include <stdint.h>
#include <cc430f6137.h> #include <cc430f6137.h>
#define MSP430_INITIAL_CPU_SPEED 7372800uL #define MSP430_INITIAL_CPU_SPEED 7372800uL
......
#ifndef BOARD_CONF_H #ifndef BOARD_CONF_H
#define BOARD_CONF_H #define BOARD_CONF_H
#include <stdint.h>
#define INFOMEM (0x1000) #define INFOMEM (0x1000)
#endif /* BOARD-CONF_H */ #endif /* BOARD-CONF_H */
export INCLUDES += -I$(RIOTBOARD)/msb-430h/include -I$(RIOTBOARD)/msb-430-common/include
include $(RIOTBOARD)/msb-430-common/Makefile.include include $(RIOTBOARD)/msb-430-common/Makefile.include
...@@ -48,6 +48,8 @@ and the mailinglist (subscription via web site) ...@@ -48,6 +48,8 @@ and the mailinglist (subscription via web site)
* @note $Id$ * @note $Id$
*/ */
#include "board-conf.h"
//MSB430 core //MSB430 core
#define MSP430_INITIAL_CPU_SPEED 2457600uL #define MSP430_INITIAL_CPU_SPEED 2457600uL
#define MSP430_HAS_DCOR 1 #define MSP430_HAS_DCOR 1
......
...@@ -65,6 +65,7 @@ and the mailinglist (subscription via web site) ...@@ -65,6 +65,7 @@ and the mailinglist (subscription via web site)
#define LED_RED_TOGGLE LEDS_PxOUT ^= LEDS_CONF_RED #define LED_RED_TOGGLE LEDS_PxOUT ^= LEDS_CONF_RED
#include <msp430x16x.h> #include <msp430x16x.h>
#include "board-conf.h"
typedef uint8_t radio_packet_length_t; typedef uint8_t radio_packet_length_t;
......
...@@ -43,7 +43,8 @@ and the mailinglist (subscription via web site) ...@@ -43,7 +43,8 @@ and the mailinglist (subscription via web site)
* @note $Id$ * @note $Id$
*/ */
#include <lpc2387.h> #include <stdint.h>
#include "lpc2387.h"
#define VICIntEnClear VICIntEnClr #define VICIntEnClear VICIntEnClr
......
#ifndef __BOARD_H #ifndef __BOARD_H
#define __BOARD_H #define __BOARD_H
#include <msba2_common.h> #include "msba2_common.h"
#include <bitarithm.h> #include "bitarithm.h"
#define LED_RED_PIN (BIT25) #define LED_RED_PIN (BIT25)
#define LED_GREEN_PIN (BIT26) #define LED_GREEN_PIN (BIT26)
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* @} * @}
*/ */
#include <stdint.h>
void _native_LED_GREEN_OFF(void); void _native_LED_GREEN_OFF(void);
#define LED_GREEN_OFF (_native_LED_GREEN_OFF()) #define LED_GREEN_OFF (_native_LED_GREEN_OFF())
void _native_LED_GREEN_ON(void); void _native_LED_GREEN_ON(void);
......
#include <lpc2148.h> #include <stdint.h>
#include "lpc2148.h"
typedef uint8_t radio_packet_length_t; typedef uint8_t radio_packet_length_t;
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#define LED_BLUE_OFF LEDS_PxOUT |= LEDS_CONF_BLUE #define LED_BLUE_OFF LEDS_PxOUT |= LEDS_CONF_BLUE
#define LED_BLUE_TOGGLE LEDS_PxOUT ^= LEDS_CONF_BLUE #define LED_BLUE_TOGGLE LEDS_PxOUT ^= LEDS_CONF_BLUE
#include <stdint.h>
#include <msp430x16x.h> #include <msp430x16x.h>
typedef uint8_t radio_packet_length_t; typedef uint8_t radio_packet_length_t;
......
...@@ -20,6 +20,6 @@ endif ...@@ -20,6 +20,6 @@ endif
export HEXFILE = bin/$(PROJECT).hex export HEXFILE = bin/$(PROJECT).hex
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)" 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 export OFLAGS = -O ihex
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
volatile static uint32_t __msp430_cpu_speed = MSP430_INITIAL_CPU_SPEED; volatile static uint32_t __msp430_cpu_speed = MSP430_INITIAL_CPU_SPEED;
void msp430_init_dco(void);
typedef enum { typedef enum {
MCLK_2MHZ_SCLK_1MHZ = 1000002uL, MCLK_2MHZ_SCLK_1MHZ = 1000002uL,
MCLK_4MHZ_SCLK_1MHZ = 1000004uL, MCLK_4MHZ_SCLK_1MHZ = 1000004uL,
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef BOARD_CONF_H #ifndef BOARD_CONF_H
#define BOARD_CONF_H #define BOARD_CONF_H
#include <stdint.h>
#define INFOMEM (0x1000) #define INFOMEM (0x1000)
#endif /* BOARD-CONF_H */ #endif /* BOARD-CONF_H */
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include include $(RIOTBOARD)/wsn430-common/Makefile.include
\ No newline at end of file
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
* @note $Id$ * @note $Id$
*/ */
#include "board-conf.h"
//MSB430 core //MSB430 core
#define MSP430_INITIAL_CPU_SPEED 800000uL #define MSP430_INITIAL_CPU_SPEED 800000uL
#define MSP430_HAS_DCOR 0 #define MSP430_HAS_DCOR 0
......
...@@ -9,7 +9,6 @@ INCLUDES += -I${RIOTBASE}/core/include/ ...@@ -9,7 +9,6 @@ INCLUDES += -I${RIOTBASE}/core/include/
INCLUDES += -Iinclude/ -I$(RIOTBOARD)/wsn430-common/include/ INCLUDES += -Iinclude/ -I$(RIOTBOARD)/wsn430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/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)/drivers/cc2420/include/ -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTBASE)/sys/net/
all: $(BINDIR)$(ARCH) all: $(BINDIR)$(ARCH)
$(MAKE) -C ../wsn430-common $(MAKE) -C ../wsn430-common
......
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include include $(RIOTBOARD)/wsn430-common/Makefile.include
\ No newline at end of file
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
* @note $Id$ * @note $Id$
*/ */
#include "board-conf.h"
//MSB430 core //MSB430 core
#define MSP430_INITIAL_CPU_SPEED 800000uL #define MSP430_INITIAL_CPU_SPEED 800000uL
#define MSP430_HAS_DCOR 0 #define MSP430_HAS_DCOR 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment