From a2dff456f787a7fd49a44104a5edfe9644e15eca Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Mon, 29 Jul 2013 01:22:03 +0200 Subject: [PATCH 1/2] rebased from origin/master --- Makefile.include | 4 +++- cpu/Makefile | 10 ++++++++-- cpu/Makefile.include | 21 ++++++++++++++++++++ cpu/arm_common/arm_cpu.c | 5 ++++- cpu/lpc_common/Makefile | 4 ++++ cpu/{arm_common => lpc_common}/hwtimer_cpu.c | 0 cpu/{arm_common => lpc_common}/iap.c | 1 + 7 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 cpu/Makefile.include create mode 100644 cpu/lpc_common/Makefile rename cpu/{arm_common => lpc_common}/hwtimer_cpu.c (100%) rename cpu/{arm_common => lpc_common}/iap.c (99%) diff --git a/Makefile.include b/Makefile.include index e239c5cf1a..16d0697727 100644 --- a/Makefile.include +++ b/Makefile.include @@ -1,3 +1,4 @@ +# set undefined variables ifeq ($(strip $(RIOTCPU)),) export RIOTCPU =$(RIOTBASE)/cpu endif @@ -11,8 +12,9 @@ BB = $(shell echo $(BOARD)|tr 'a-z' 'A-Z') CFLAGS += -DBOARD=$(BB) export CFLAGS -# mandatory include! +# mandatory includes! include $(RIOTBOARD)/$(BOARD)/Makefile.include +include $(RIOTCPU)/Makefile.include include $(RIOTBASE)/Makefile.modules # your binaries to link diff --git a/cpu/Makefile b/cpu/Makefile index b0f6e8f4df..19c8c89533 100644 --- a/cpu/Makefile +++ b/cpu/Makefile @@ -1,9 +1,13 @@ ifeq ($(CPU),lpc2387) - DIRS = arm_common lpc2387 + DIRS = arm_common lpc_common lpc2387 endif ifeq ($(CPU),lpc214x) - DIRS = arm_common lpc214x + DIRS = arm_common lpc_common lpc214x +endif + +ifeq ($(CPU),mc1322x) + DIRS = arm_common mc1322x endif ifeq ($(CPU),cc430) @@ -28,6 +32,8 @@ $(DIRS): clean: @$(MAKE) -C lpc2387 clean + @$(MAKE) -C mc1322x clean + @$(MAKE) -C lpc_common clean @$(MAKE) -C arm_common clean @$(MAKE) -C cc430 clean @$(MAKE) -C msp430-common clean diff --git a/cpu/Makefile.include b/cpu/Makefile.include new file mode 100644 index 0000000000..968ca3812b --- /dev/null +++ b/cpu/Makefile.include @@ -0,0 +1,21 @@ +### Minimal setup +ifeq ($(CPU),lpc2387) + export USEMODULE += arm_common lpc_common + export UNDEF += $(BINDIR)syscalls.o + export INCLUDES += -I$(RIOTCPU)/arm_common/include + export INCLUDES += -I$(RIOTCPU)/lpc_common/include +endif +ifeq ($(CPU),lpc214x) + export USEMODULE += arm_common lpc_common + export UNDEF += $(BINDIR)syscalls.o + export INCLUDES += -I$(RIOTCPU)/arm_common/include + export INCLUDES += -I$(RIOTCPU)/lpc_common/include +endif +ifeq ($(CPU),mc1322x) + export USEMODULE += arm_common + export UNDEF += $(BINDIR)syscalls.o + export INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include +endif +ifeq ($(CPU),native) + export INCLUDES += -I$(RIOTBASE)/cpu/native/include +endif diff --git a/cpu/arm_common/arm_cpu.c b/cpu/arm_common/arm_cpu.c index f2177dc7c3..49ef69dbb8 100644 --- a/cpu/arm_common/arm_cpu.c +++ b/cpu/arm_common/arm_cpu.c @@ -89,7 +89,9 @@ void thread_print_stack(void) printf("STACK (%u)= %X \n", i, *s); } -__attribute__((naked, noreturn)) void arm_reset(void) +/* LPC specific */ +#ifdef WDTC +__attribute__((naked,noreturn)) void arm_reset(void) { dINT(); WDTC = 0x00FFF; @@ -99,3 +101,4 @@ __attribute__((naked, noreturn)) void arm_reset(void) while (1); } +#endif diff --git a/cpu/lpc_common/Makefile b/cpu/lpc_common/Makefile new file mode 100644 index 0000000000..b8ccbfb0ef --- /dev/null +++ b/cpu/lpc_common/Makefile @@ -0,0 +1,4 @@ +MODULE =lpc_common + +include $(RIOTBASE)/Makefile.base + diff --git a/cpu/arm_common/hwtimer_cpu.c b/cpu/lpc_common/hwtimer_cpu.c similarity index 100% rename from cpu/arm_common/hwtimer_cpu.c rename to cpu/lpc_common/hwtimer_cpu.c diff --git a/cpu/arm_common/iap.c b/cpu/lpc_common/iap.c similarity index 99% rename from cpu/arm_common/iap.c rename to cpu/lpc_common/iap.c index 9c261cf5fd..56dee0e693 100644 --- a/cpu/arm_common/iap.c +++ b/cpu/lpc_common/iap.c @@ -7,6 +7,7 @@ #include #include #include +/* TODO: replace by a lpc generic header */ #include #define ENABLE_DEBUG (0) From f7ecc704a47967a028ee9400fb5a5f995404f564 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Mon, 29 Jul 2013 01:24:02 +0200 Subject: [PATCH 2/2] fixed includes and include pathes --- Makefile.dep | 6 ++++++ core/Makefile | 2 +- drivers/cc110x/Makefile | 4 +--- drivers/cc110x/cc1100-csmaca-mac.c | 2 +- drivers/cc110x/cc1100.c | 2 +- drivers/cc110x/cc1100_phy.c | 4 ++-- sys/Makefile | 2 +- sys/auto_init/Makefile | 1 - sys/net/sixlowpan/rpl/etx_beaconing.c | 4 ++-- sys/net/sixlowpan/rpl/rpl.h | 2 +- sys/net/sixlowpan/rpl/rpl_structs.h | 2 +- sys/transceiver/Makefile | 1 - 12 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 2e13d5e40e..de8da13ac3 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -13,6 +13,12 @@ ifneq (,$(findstring uart0,$(USEMODULE))) endif endif +ifneq (,$(findstring cc110x,$(USEMODULE))) + ifeq (,$(findstring protocol-multiplex,$(USEMODULE))) + USEMODULE += protocol-multiplex + endif +endif + ifneq (,$(findstring cc110x_ng,$(USEMODULE))) ifeq (,$(findstring transceiver,$(USEMODULE))) USEMODULE += transceiver diff --git a/core/Makefile b/core/Makefile index 4bf9f52402..6a5709576b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1,5 +1,5 @@ MODULE =core -INCLUDES = -Iinclude/ -I../sys/include -I../sys/lib -I../sys/drivers/include -I$(RIOTCPU)/$(CPU)/include/ -I../.. -I../drivers/include/ +INCLUDES += -Iinclude/ -I../sys/include -I../sys/lib -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include include $(RIOTBASE)/Makefile.base diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile index 43de7a3aa6..85d5f0629d 100644 --- a/drivers/cc110x/Makefile +++ b/drivers/cc110x/Makefile @@ -1,6 +1,4 @@ -INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../../net/protocol-multiplex -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../ - -MODULE =cc110x_ng +MODULE =cc110x include $(MAKEBASE)/Makefile.base diff --git a/drivers/cc110x/cc1100-csmaca-mac.c b/drivers/cc110x/cc1100-csmaca-mac.c index aea7d89459..67ae27b654 100644 --- a/drivers/cc110x/cc1100-csmaca-mac.c +++ b/drivers/cc110x/cc1100-csmaca-mac.c @@ -44,7 +44,7 @@ and the mailinglist (subscription via web site) #include #include #include -#include +#include "protocol-multiplex/protocol-multiplex.h" #include "hwtimer.h" #include diff --git a/drivers/cc110x/cc1100.c b/drivers/cc110x/cc1100.c index 5218eac4b7..6fd400c065 100644 --- a/drivers/cc110x/cc1100.c +++ b/drivers/cc110x/cc1100.c @@ -41,7 +41,7 @@ #include "cc1100-defaultSettings.h" #include "hwtimer.h" -#include "core/include/bitarithm.h" +#include "bitarithm.h" /* TODO: cc1100 port timer */ #ifdef FEUERWARE_CPU_LPC2387 diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c index 1ccc1f43ce..28fc4f76bf 100644 --- a/drivers/cc110x/cc1100_phy.c +++ b/drivers/cc110x/cc1100_phy.c @@ -53,7 +53,7 @@ and the mailinglist (subscription via web site) #include "cc1100_phy.h" #include "cc1100-defaultSettings.h" -#include "protocol-multiplex.h" +#include "protocol-multiplex/protocol-multiplex.h" #include "kernel.h" #include "thread.h" @@ -846,7 +846,7 @@ void cc1100_phy_rx_handler(void) /* Valid packet. After a wake-up, the radio should be in IDLE. * So put CC1100 to RX for WOR_TIMEOUT (have to manually put * the radio back to sleep/WOR).*/ - cc1100_spi_write_reg(CC1100_MCSM0, 0x08); * Turn off FS-Autocal + cc1100_spi_write_reg(CC1100_MCSM0, 0x08); /* Turn off FS-Autocal */ cc1100_spi_write_reg(CC1100_MCSM2, 0x07); /* Configure RX_TIME (until end of packet) */ if (radio_mode == CC1100_MODE_CONSTANT_RX) { diff --git a/sys/Makefile b/sys/Makefile index 10f9a9b948..000c30dc61 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,4 +1,4 @@ -INCLUDES = -Iinclude -I$(RIOTBASE)/drivers/ -I$(RIOTBASE)/drivers/include -Ilib -I$(RIOTCPU)/$(CPU)/include -Inet -I../core/include +INCLUDES += -Iinclude -I$(RIOTBASE)/drivers/ -I$(RIOTBASE)/drivers/include -Ilib -I$(RIOTCPU)/$(CPU)/include -Inet -I../core/include MODULE =sys ifneq (,$(findstring auto_init,$(USEMODULE))) diff --git a/sys/auto_init/Makefile b/sys/auto_init/Makefile index d807664555..8b2b20a9fd 100644 --- a/sys/auto_init/Makefile +++ b/sys/auto_init/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include MODULE = auto_init include $(RIOTBASE)/Makefile.base diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.c b/sys/net/sixlowpan/rpl/etx_beaconing.c index a2380b8cea..533655bf06 100644 --- a/sys/net/sixlowpan/rpl/etx_beaconing.c +++ b/sys/net/sixlowpan/rpl/etx_beaconing.c @@ -15,8 +15,8 @@ #include #include -#include "sys/net/sixlowpan/sixlowmac.h" -#include "sys/net/sixlowpan/ieee802154_frame.h" +#include "sixlowpan/sixlowmac.h" +#include "ieee802154/ieee802154_frame.h" //prototytpes static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate); diff --git a/sys/net/sixlowpan/rpl/rpl.h b/sys/net/sixlowpan/rpl/rpl.h index 7ab2f87206..c38a2bf2ea 100644 --- a/sys/net/sixlowpan/rpl/rpl.h +++ b/sys/net/sixlowpan/rpl/rpl.h @@ -20,7 +20,7 @@ #include #include #include -#include "sys/net/sixlowpan/sixlowip.h" +#include "sixlowpan/sixlowip.h" #include "rpl_dodag.h" #define CC1100_RADIO_MODE CC1100_MODE_WOR diff --git a/sys/net/sixlowpan/rpl/rpl_structs.h b/sys/net/sixlowpan/rpl/rpl_structs.h index 830eac15ae..f0e8f14d8d 100644 --- a/sys/net/sixlowpan/rpl/rpl_structs.h +++ b/sys/net/sixlowpan/rpl/rpl_structs.h @@ -16,7 +16,7 @@ */ #include -#include "sys/net/sixlowpan/sixlowip.h" +#include "sixlowpan/sixlowip.h" #ifndef RPL_STRUCTS_H_INCLUDED #define RPL_STRUCTS_H_INCLUDED diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile index f3718a1d15..4fcf17425d 100644 --- a/sys/transceiver/Makefile +++ b/sys/transceiver/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBAE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I../lib -I$(RIOTCPU)/$(CPU)/include -I../net -I../../core/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/ieee802154/ MODULE =transceiver include $(MAKEBASE)/Makefile.base