RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

fixed includes and include pathes

Browse Source
This commit is contained in:
Oleg Hahm 2013-07-29 01:24:02 +02:00
parent a2dff456f7
commit f7ecc704a4
12 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.dep
View File

@ -13,6 +13,12 @@ ifneq (,$(findstring uart0,$(USEMODULE)))
endif endif
endif endif
ifneq (,$(findstring cc110x,$(USEMODULE)))
ifeq (,$(findstring protocol-multiplex,$(USEMODULE)))
USEMODULE += protocol-multiplex
endif
endif
ifneq (,$(findstring cc110x_ng,$(USEMODULE))) ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
ifeq (,$(findstring transceiver,$(USEMODULE))) ifeq (,$(findstring transceiver,$(USEMODULE)))
USEMODULE += transceiver USEMODULE += transceiver

2
core/Makefile
View File

@ -1,5 +1,5 @@
MODULE =core 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 include $(RIOTBASE)/Makefile.base

4
drivers/cc110x/Makefile
View File

@ -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
MODULE =cc110x_ng
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base

2
drivers/cc110x/cc1100-csmaca-mac.c
View File

@ -44,7 +44,7 @@ and the mailinglist (subscription via web site)
#include <cc1100.h> #include <cc1100.h>
#include <cc1100_phy.h> #include <cc1100_phy.h>
#include <cc1100-csmaca-mac.h> #include <cc1100-csmaca-mac.h>
#include <protocol-multiplex.h> #include "protocol-multiplex/protocol-multiplex.h"
#include "hwtimer.h" #include "hwtimer.h"
#include <vtimer.h> #include <vtimer.h>

2
drivers/cc110x/cc1100.c
View File

@ -41,7 +41,7 @@
#include "cc1100-defaultSettings.h" #include "cc1100-defaultSettings.h"
#include "hwtimer.h" #include "hwtimer.h"
#include "core/include/bitarithm.h" #include "bitarithm.h"
/* TODO: cc1100 port timer */ /* TODO: cc1100 port timer */
#ifdef FEUERWARE_CPU_LPC2387 #ifdef FEUERWARE_CPU_LPC2387

4
drivers/cc110x/cc1100_phy.c
View File

@ -53,7 +53,7 @@ and the mailinglist (subscription via web site)
#include "cc1100_phy.h" #include "cc1100_phy.h"
#include "cc1100-defaultSettings.h" #include "cc1100-defaultSettings.h"
#include "protocol-multiplex.h" #include "protocol-multiplex/protocol-multiplex.h"
#include "kernel.h" #include "kernel.h"
#include "thread.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. /* Valid packet. After a wake-up, the radio should be in IDLE.
* So put CC1100 to RX for WOR_TIMEOUT (have to manually put * So put CC1100 to RX for WOR_TIMEOUT (have to manually put
* the radio back to sleep/WOR).*/ * 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) */ cc1100_spi_write_reg(CC1100_MCSM2, 0x07); /* Configure RX_TIME (until end of packet) */
if (radio_mode == CC1100_MODE_CONSTANT_RX) { if (radio_mode == CC1100_MODE_CONSTANT_RX) {

2
sys/Makefile
View File

@ -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 MODULE =sys
ifneq (,$(findstring auto_init,$(USEMODULE))) ifneq (,$(findstring auto_init,$(USEMODULE)))

1
sys/auto_init/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
MODULE = auto_init MODULE = auto_init
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

4
sys/net/sixlowpan/rpl/etx_beaconing.c
View File

@ -15,8 +15,8 @@
#include <thread.h> #include <thread.h>
#include <transceiver.h> #include <transceiver.h>
#include "sys/net/sixlowpan/sixlowmac.h" #include "sixlowpan/sixlowmac.h"
#include "sys/net/sixlowpan/ieee802154_frame.h" #include "ieee802154/ieee802154_frame.h"
//prototytpes //prototytpes
static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate); static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate);

2
sys/net/sixlowpan/rpl/rpl.h
View File

@ -20,7 +20,7 @@
#include <vtimer.h> #include <vtimer.h>
#include <mutex.h> #include <mutex.h>
#include <transceiver.h> #include <transceiver.h>
#include "sys/net/sixlowpan/sixlowip.h" #include "sixlowpan/sixlowip.h"
#include "rpl_dodag.h" #include "rpl_dodag.h"
#define CC1100_RADIO_MODE CC1100_MODE_WOR #define CC1100_RADIO_MODE CC1100_MODE_WOR

2
sys/net/sixlowpan/rpl/rpl_structs.h
View File

@ -16,7 +16,7 @@
*/ */
#include <string.h> #include <string.h>
#include "sys/net/sixlowpan/sixlowip.h" #include "sixlowpan/sixlowip.h"
#ifndef RPL_STRUCTS_H_INCLUDED #ifndef RPL_STRUCTS_H_INCLUDED
#define RPL_STRUCTS_H_INCLUDED #define RPL_STRUCTS_H_INCLUDED

1
sys/transceiver/Makefile
View File

@ -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 MODULE =transceiver
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base