Merge pull request #36 from OlegHahm/include_fixes
fixed missing inttypes includes for all platforms
This commit is contained in:
commit
e35e24f002
@ -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"
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#ifndef _MSB_BOARD_H
|
||||
#define _MSB_BOARD_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <cc430f6137.h>
|
||||
|
||||
#define MSP430_INITIAL_CPU_SPEED 7372800uL
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
#ifndef BOARD_CONF_H
|
||||
#define BOARD_CONF_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#define INFOMEM (0x1000)
|
||||
|
||||
#endif /* BOARD-CONF_H */
|
||||
|
||||
@ -1 +1,2 @@
|
||||
export INCLUDES += -I$(RIOTBOARD)/msb-430h/include -I$(RIOTBOARD)/msb-430-common/include
|
||||
include $(RIOTBOARD)/msb-430-common/Makefile.include
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
#ifndef BOARD_H
|
||||
#define BOARD_H
|
||||
|
||||
/**
|
||||
* Native Board interface
|
||||
*
|
||||
@ -15,6 +18,8 @@
|
||||
* @}
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
void _native_LED_GREEN_OFF(void);
|
||||
#define LED_GREEN_OFF (_native_LED_GREEN_OFF())
|
||||
void _native_LED_GREEN_ON(void);
|
||||
@ -29,3 +34,4 @@ void _native_LED_RED_TOGGLE(void);
|
||||
#define LED_RED_TOGGLE (_native_LED_RED_TOGGLE())
|
||||
|
||||
typedef uint16_t radio_packet_length_t;
|
||||
#endif /* BOARD_H */
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#include <lpc2148.h>
|
||||
#include <stdint.h>
|
||||
#include "lpc2148.h"
|
||||
|
||||
typedef uint8_t radio_packet_length_t;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
#ifndef BOARD_CONF_H
|
||||
#define BOARD_CONF_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#define INFOMEM (0x1000)
|
||||
|
||||
#endif /* BOARD-CONF_H */
|
||||
|
||||
@ -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
|
||||
|
||||
@ -31,6 +31,8 @@
|
||||
* @note $Id$
|
||||
*/
|
||||
|
||||
#include "board-conf.h"
|
||||
|
||||
//MSB430 core
|
||||
#define MSP430_INITIAL_CPU_SPEED 800000uL
|
||||
#define MSP430_HAS_DCOR 0
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -31,6 +31,8 @@
|
||||
* @note $Id$
|
||||
*/
|
||||
|
||||
#include "board-conf.h"
|
||||
|
||||
//MSB430 core
|
||||
#define MSP430_INITIAL_CPU_SPEED 800000uL
|
||||
#define MSP430_HAS_DCOR 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user