streamlined driver include pathes

boards/avsextrem/drivers/Makefile

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

boards/avsextrem/drivers/avsextrem-cc1100.c

@@ -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)

boards/chronos/drivers/Makefile

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

boards/chronos/drivers/cc430-cc110x.c

@@ -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)

boards/msb-430h/Makefile

@@ -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 ;
 

boards/msb-430h/driver_cc110x.c

@@ -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

boards/msba2-common/drivers/Makefile

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

boards/msba2-common/drivers/msba2-cc110x.c

@@ -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"
 

boards/wsn430-v1_3b/Makefile

@@ -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 ;

boards/wsn430-v1_3b/driver_cc110x.c

@@ -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

cpu/cc430/Makefile

@@ -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 ;
 

cpu/cc430/cc110x_cc430.c

@@ -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"
 

drivers/cc110x_ng/cc110x-defaultSettings.c

@@ -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

drivers/cc110x_ng/cc110x-rx.c

@@ -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"

drivers/cc110x_ng/cc110x-tx.c

@@ -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"
 

drivers/cc110x_ng/cc110x.c

@@ -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"

drivers/cc110x_ng/spi/Makefile

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

drivers/cc110x_ng/spi/cc110x_spi.c

@@ -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"
 

drivers/include/cc110x.h

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

drivers/include/cc110x_ng.h

@@ -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 */

drivers/include/cc110x_ng/cc110x-defaultSettings.h

@@ -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)
 

drivers/include/cc110x_ng/cc110x-interface.h

@@ -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 */

sys/net/network_layer/sixlowpan/Makefile

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

sys/net/routing/rpl/Makefile

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

sys/net/transport_layer/destiny/Makefile

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

sys/shell/commands/Makefile

@@ -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)))

sys/shell/commands/sc_cc1100.c

@@ -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"

sys/transceiver/Makefile

@@ -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