kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-30 17:01:19 +01:00
Code Releases Activity

Merge pull request #482 from OlegHahm/driver_includes

Browse Source 
Driver includes
This commit is contained in:
Oleg Hahm 2014-02-07 17:21:45 +01:00
commit 355f6610d5
36 changed files with 33 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/avsextrem/drivers/Makefile
View File

@ -1,5 +1,4 @@
MODULE =avsextrem_base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
include $(RIOTBASE)/Makefile.base

8
boards/avsextrem/drivers/avsextrem-cc1100.c
View File

@ -28,9 +28,7 @@
// cpu
#include "cpu.h"
// sys
#include "cc1100.h"
#include "arch_cc1100.h"
#include "cc1100_spi.h"
#include "cc110x_ng.h"
#include "gpioint.h"
#define CC1100_GDO0 (FIO2PIN & BIT6) // read serial I/O (GDO0)
@ -222,7 +220,7 @@ void cc1100_gdo2_disable(void)
void cc1100_gdo2_enable(void)
{
gpioint_set(0, BIT28, GPIOINT_FALLING_EDGE, &cc1100_gdo2_irq);
gpioint_set(0, BIT28, GPIOINT_FALLING_EDGE, &cc110x_gdo2_irq);
}
void cc1100_before_send(void)
@ -239,7 +237,7 @@ void cc1100_after_send(void)
void cc1100_gdo0_enable(void)
{
gpioint_set(2, BIT6, GPIOINT_RISING_EDGE, &cc1100_gdo0_irq);
gpioint_set(2, BIT6, GPIOINT_RISING_EDGE, &cc110x_gdo0_irq);
}
void cc1100_gdo0_disable(void)

2
boards/chronos/drivers/Makefile
View File

@ -1,5 +1,3 @@
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

2
boards/chronos/drivers/cc430-cc110x.c
View File

@ -25,8 +25,6 @@
#include "cpu.h"
#include "irq.h"
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#define CC1100_GDO0 (RF1AIN & BIT0)
#define CC1100_GDO1 (RF1AIN & BIT1)

2
boards/msb-430h/Makefile
View File

@ -2,8 +2,6 @@ MODULE =$(BOARD)_base
DIRS = $(RIOTBOARD)/msb-430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

2
boards/msb-430h/driver_cc110x.c
View File

@ -176,7 +176,7 @@ void cc110x_init_interrupts(void)
restoreIRQ(state); /* Enable all interrupts */
}
void cc110x_spi_init(uint8_t clockrate)
void cc110x_spi_init(void)
{
// Switch off async UART
while (!(UTCTL0 & TXEPT)); // Wait for empty UxTXBUF register

2
boards/msba2-common/drivers/Makefile
View File

@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

2
boards/msba2-common/drivers/msba2-cc110x.c → boards/msba2/msba2-cc110x.c
View File

@ -45,8 +45,6 @@ and the mailinglist (subscription via web site)
#include "cpu.h"
/* drivers */
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#include "cc110x_spi.h"
#include "gpioint.h"

1
boards/wsn430-v1_3b/Makefile
View File

@ -1,7 +1,6 @@
MODULE =$(BOARD)_base
DIRS = $(RIOTBOARD)/wsn430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

3
boards/wsn430-v1_3b/driver_cc110x.c
View File

@ -14,7 +14,6 @@
#include "irq.h"
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#define CC1100_GDO0 (P1IN & 0x08) // read serial I/O (GDO0)
#define CC1100_GDO1 (P5IN & 0x04) // read serial I/O (GDO1)
@ -153,7 +152,7 @@ void cc110x_init_interrupts(void)
restoreIRQ(state); /* Enable all interrupts */
}
void cc110x_spi_init(uint8_t clockrate)
void cc110x_spi_init(void)
{
// Switch off async UART
while(!(U1TCTL & TXEPT)); // Wait for empty UxTXBUF register

2
cpu/cc430/Makefile
View File

@ -2,8 +2,6 @@ MODULE = cpu
DIRS = $(RIOTCPU)/msp430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

3
cpu/cc430/cc110x_cc430.c
View File

@ -20,8 +20,7 @@
#include <stdint.h>
#include "irq.h"
#include "cc110x-defaultSettings.h"
#include "cc110x-reg.h"
#include "cc110x_ng.h"
#include "board.h"
#include "hwtimer.h"

5
drivers/cc110x_ng/cc110x-defaultSettings.c
View File

@ -21,7 +21,10 @@
* @}
*/
#include "cc110x-defaultSettings.h"
#include "cc110x_ng.h"
// Default PA table index (output power)
#define PATABLE (11)
/**
* Usable, non overlapping channels and corresponding frequencies

0
drivers/cc110x_ng/include/cc110x-internal.h → drivers/cc110x_ng/cc110x-internal.h
View File

4
drivers/cc110x_ng/cc110x-rx.c
View File

@ -19,10 +19,6 @@
#include "cc110x_ng.h"
#include "cc110x-internal.h"
#include "cc110x-config.h"
#include "cc110x-defaultSettings.h"
#include "cc110x_spi.h"
#include "cc110x-reg.h"
#include "hwtimer.h"
#include "msg.h"

4
drivers/cc110x_ng/cc110x-tx.c
View File

@ -19,11 +19,7 @@
#include <stdio.h>
#include "cc110x_ng.h"
#include "cc110x-defaultSettings.h"
#include "cc110x-internal.h"
#include "cc110x-arch.h"
#include "cc110x_spi.h"
#include "cc110x-reg.h"
#include "irq.h"

5
drivers/cc110x_ng/cc110x.c
View File

@ -17,12 +17,7 @@
* @}
*/
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#include "cc110x-config.h"
#include "cc110x-defaultSettings.h"
#include "cc110x-internal.h"
#include "cc110x_spi.h"
#include "cc110x-reg.h"
#include "hwtimer.h"
#include "config.h"

2
drivers/cc110x_ng/spi/Makefile
View File

@ -1,4 +1,6 @@
MODULE =cc110x_spi
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng
include $(MAKEBASE)/Makefile.base

3
drivers/cc110x_ng/spi/cc110x_spi.c
View File

@ -28,10 +28,7 @@
#include <stdio.h>
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#include "cc110x-internal.h"
#include "cc110x_spi.h"
#include "cc110x-reg.h"
#include "irq.h"

0
drivers/at86rf231/include/at86rf231.h → drivers/include/at86rf231.h
View File

6
drivers/include/cc110x.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef CC110X_H
#define CC110X_H
#include "cc110x/cc1100-interface.h"
#endif /* CC110X_H */

0
drivers/cc110x/cc1100-interface.h → drivers/include/cc110x/cc1100-interface.h
View File

11
drivers/include/cc110x_ng.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef CC110X_NG_H
#define CC110X_NG_H
#include "cc110x_ng/cc110x-interface.h"
#include "cc110x_ng/cc110x-defaultSettings.h"
#include "cc110x_ng/cc110x-config.h"
#include "cc110x_ng/cc110x-reg.h"
#include "cc110x_ng/cc110x-arch.h"
#include "cc110x_ng/cc110x_spi.h"
#endif /* CC110X_NG_H */

0
drivers/cc110x_ng/include/cc110x-arch.h → drivers/include/cc110x_ng/cc110x-arch.h
View File

0
drivers/cc110x_ng/include/cc110x-config.h → drivers/include/cc110x_ng/cc110x-config.h
View File

3
drivers/cc110x_ng/include/cc110x-defaultSettings.h → drivers/include/cc110x_ng/cc110x-defaultSettings.h
View File

@ -34,9 +34,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
#define TIMER_TICK_USEC_RES (122)
// Default PA table index (output power)
#define PATABLE (11)
// Watchdog cycle time in seconds, set 0 to disable watchdog
#define CC1100_WATCHDOG_PERIOD (5)

6
drivers/cc110x_ng/include/cc110x_ng.h → drivers/include/cc110x_ng/cc110x-interface.h
View File

@ -19,8 +19,8 @@
* @author Oliver Hahm <oliver.hahm@inria.fr>
*/
#ifndef CC1100_H
#define CC1100_H
#ifndef CC110X_NG_INTERFACE_H
#define CC110X_NG_INTERFACE_H
#include <stdint.h>
#include "radio/radio.h"
@ -172,4 +172,4 @@ uint8_t cc110x_add_ignored(radio_address_t addr);
#endif
/** @} */
#endif
#endif /* CC110X_NG_INTERFACE_H */

0
drivers/cc110x_ng/include/cc110x-reg.h → drivers/include/cc110x_ng/cc110x-reg.h
View File

0
drivers/cc110x_ng/include/cc110x_spi.h → drivers/include/cc110x_ng/cc110x_spi.h
View File

0
drivers/cc2420/include/cc2420.h → drivers/include/cc2420.h
View File

1
sys/net/network_layer/sixlowpan/Makefile
View File

@ -1,3 +1,2 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

2
sys/net/routing/rpl/Makefile
View File

@ -1,5 +1,3 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

1
sys/net/transport_layer/destiny/Makefile
View File

@ -1,4 +1,3 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc110x
include $(RIOTBASE)/Makefile.base

4
sys/shell/commands/Makefile
View File

@ -1,19 +1,15 @@
SRC = shell_commands.c sc_id.c
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
SRC += sc_cc110x_ng.c
endif
ifneq (,$(findstring cc2420,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include/ -I$(RIOTBASE)/sys/net/include
SRC += sc_cc2420.c
endif
ifneq (,$(findstring cc110x,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/drivers/cc110x/
SRC += sc_cc1100.c
endif
ifneq (,$(findstring nativenet,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/cpu/native/include
SRC += sc_nativenet.c
endif
ifneq (,$(findstring mci,$(USEMODULE)))

2
sys/shell/commands/sc_cc1100.c
View File

@ -18,7 +18,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "cc1100-interface.h"
#include "cc110x.h"
#ifdef MODULE_CC110X
#include "msg.h"

2
sys/transceiver/Makefile
View File

@ -1,7 +1,5 @@
MODULE =transceiver
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/drivers/at86rf231/include
include $(MAKEBASE)/Makefile.base