drivers - cc110x_ng: rename ng driver to legacy

Makefile.dep

@@ -66,7 +66,7 @@ ifneq (,$(filter cc110x%,$(USEMODULE)))
 	USEMODULE += vtimer
 endif
 
-ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
 	USEMODULE += transceiver
 endif
 

boards/avsextrem/Makefile.include

@@ -1,7 +1,7 @@
 export INCLUDES += -I$(RIOTBOARD)/avsextrem/include
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	USEMODULE += cc110x_ng
+	USEMODULE += cc110x_legacy
 	USEMODULE += transceiver
 endif
 

boards/avsextrem/drivers/avsextrem-cc1100.c

@@ -27,7 +27,7 @@
 // cpu
 #include "cpu.h"
 // sys
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 #include "gpioint.h"
 
 #define CC1100_GDO0   (FIO2PIN & BIT6)  // read serial I/O (GDO0)

boards/chronos/Makefile.dep

@@ -1,4 +1,4 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	USEMODULE += cc110x_ng
+	USEMODULE += cc110x_legacy
 	USEMODULE += transceiver
 endif

boards/chronos/drivers/cc430-cc110x.c

@@ -25,7 +25,7 @@
 
 #include "cpu.h"
 #include "irq.h"
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 
 #define CC1100_GDO0     (RF1AIN & BIT0)
 #define CC1100_GDO1     (RF1AIN & BIT1)

boards/msb-430h/Makefile.dep

@@ -1,8 +1,8 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	USEMODULE += cc110x_ng
+	USEMODULE += cc110x_legacy
 	USEMODULE += transceiver
 endif
 
-ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
 	USEMODULE += cc110x_spi
 endif

boards/msb-430h/driver_cc110x.c

@@ -12,7 +12,7 @@
 #include "cpu.h"
 #include "irq.h"
 
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 
 #define CC1100_GDO0         (P2IN & 0x02)   // read serial I/O (GDO0)
 #define CC1100_GDO1         (P3IN & 0x04)   // read serial I/O (GDO1)

boards/msba2-common/Makefile.dep

@@ -2,7 +2,7 @@ ifneq (,$(filter cc110x,$(USEMODULE)))
 	USEMODULE += gpioint
 endif
 
-ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
 	USEMODULE += cc110x_spi
 	USEMODULE += gpioint
 endif

boards/msba2/Makefile.include

@@ -1,7 +1,7 @@
 export INCLUDES += -I$(RIOTBOARD)/msba2/include
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	USEMODULE += cc110x_ng
+	USEMODULE += cc110x_legacy
 	USEMODULE += transceiver
 endif
 

boards/msba2/msba2-cc110x.c

@@ -25,7 +25,7 @@
 /* cpu */
 #include "cpu.h"
 /* drivers  */
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 
 #include "gpioint.h"
 

boards/wsn430-v1_3b/Makefile.dep

@@ -1,9 +1,9 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-    USEMODULE += cc110x_ng
+    USEMODULE += cc110x_legacy
     USEMODULE += transceiver
 endif
 
-ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
     USEMODULE += cc110x_spi
 endif
 

boards/wsn430-v1_3b/driver_cc110x.c

@@ -14,7 +14,7 @@
 #include "cpu.h"
 #include "irq.h"
 
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 
 #define CC1100_GDO0         (P1IN & 0x08)   // read serial I/O (GDO0)
 #define CC1100_GDO1         (P5IN & 0x04)   // read serial I/O (GDO1)

cpu/cc430/cc110x_cc430.c

@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include "irq.h"
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 #include "board.h"
 #include "hwtimer.h"
 

drivers/Makefile

@@ -13,8 +13,8 @@ endif
 ifneq (,$(filter cc110x,$(USEMODULE)))
     DIRS += cc110x
 endif
-ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-    DIRS += cc110x_ng
+ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
+    DIRS += cc110x_legacy
 endif
 ifneq (,$(filter at86rf231,$(USEMODULE)))
     DIRS += at86rf231

drivers/Makefile.include

@@ -4,8 +4,8 @@ endif
 ifneq (,$(filter cc110x,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x/include
 endif
-ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_ng/include
+ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
+    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_legacy/include
 endif
 ifneq (,$(filter at86rf231,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/drivers/at86rf231/include

drivers/cc110x_legacy/cc110x-defaultSettings.c

@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup   drivers_cc110x_ng
+ * @ingroup   drivers_cc110x_legacy
  * @{
  *
  * @file
@@ -19,7 +19,7 @@
  * @}
  */
 
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 
 // Default PA table index (output power)
 #define PATABLE                 (11)

drivers/cc110x_legacy/cc110x-internal.h

@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file        cc110x-internal.h

drivers/cc110x_legacy/cc110x-rx.c

@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  * @file        cc110x-rx.c
  * @brief       Functions for packet reception on cc110x
@@ -17,7 +17,7 @@
  * @}
  */
 
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 #include "cc110x-internal.h"
 
 #include "kernel_types.h"

drivers/cc110x_legacy/cc110x-tx.c

@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  * @file        cc110x-tx.c
  * @brief       Functions for packet transmission on cc110x
@@ -18,7 +18,7 @@
  */
 #include <stdio.h>
 
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 #include "cc110x-internal.h"
 
 #include "irq.h"

drivers/cc110x_legacy/cc110x.c

@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  * @file        cc110x.c
  * @brief       Basic functionality of cc110x driver
@@ -16,7 +16,7 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @}
  */
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 #include "cc110x-internal.h"
 
 #include "hwtimer.h"
@@ -305,7 +305,7 @@ void cc110x_print_config(void)
 
 void cc110x_switch_to_pwd(void)
 {
-    DEBUG("[cc110x_ng] switching to powerdown\n");
+    DEBUG("[cc110x_legacy] switching to powerdown\n");
     cc110x_wakeup_from_rx();
     cc110x_strobe(CC1100_SPWD);
     radio_state = RADIO_PWD;

drivers/cc110x_legacy/spi/Makefile

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

drivers/cc110x_legacy/spi/cc110x_spi.c

@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file        cc110x_spi.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "cc110x_ng.h"
+#include "cc110x_legacy.h"
 #include "cc110x-internal.h"
 
 #include "irq.h"

drivers/include/cc110x_legacy.h

@@ -0,0 +1,19 @@
+#ifndef CC110X_LEGACY_H
+#define CC110X_LEGACY_H
+
+#include "cc110x_legacy/cc110x-interface.h"
+#include "cc110x_legacy/cc110x-defaultSettings.h"
+#include "cc110x_legacy/cc110x-config.h"
+#include "cc110x_legacy/cc110x-reg.h"
+#include "cc110x_legacy/cc110x-arch.h"
+#include "cc110x_legacy/cc110x_spi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CC110X_LEGACY_H */

drivers/include/cc110x_legacy/cc110x-arch.h

@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file        cc110x-arch.h

drivers/include/cc110x_legacy/cc110x-config.h

@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file        cc110x-config.h

drivers/include/cc110x_legacy/cc110x-defaultSettings.h

@@ -10,7 +10,7 @@
 #define __CC1100_DEFAULTSETTINGS_H
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file

drivers/include/cc110x_legacy/cc110x-interface.h

@@ -8,19 +8,19 @@
  */
 
 /**
- * @defgroup    drivers_cc110x_ng CC110x_ng
+ * @defgroup    drivers_cc110x_legacy CC110x_legacy
  * @brief       Driver for Texas Instruments CC110x (without MAC protocol)
  * @ingroup     drivers
  * @{
  *
- * @file        cc110x_ng.h
+ * @file        cc110x_legacy.h
  * @brief       Data structures and variables for the cc110x driver interface
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef CC110X_NG_INTERFACE_H
-#define CC110X_NG_INTERFACE_H
+#ifndef CC110X_LEGACY_INTERFACE_H
+#define CC110X_LEGACY_INTERFACE_H
 
 #include <stdint.h>
 #include "radio/radio.h"
@@ -180,4 +180,4 @@ uint8_t cc110x_add_ignored(radio_address_t addr);
 #endif
 
 /** @} */
-#endif /* CC110X_NG_INTERFACE_H */
+#endif /* CC110X_LEGACY_INTERFACE_H */

drivers/include/cc110x_legacy/cc110x-reg.h

@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file        cc110x-reg.h

drivers/include/cc110x_legacy/cc110x_spi.h

@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     drivers_cc110x_ng
+ * @ingroup     drivers_cc110x_legacy
  * @{
  *
  * @file

drivers/include/cc110x_ng.h

@@ -1,19 +0,0 @@
-#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"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CC110X_NG_H */

pkg/libcoap/0001-Add-RIOT-Makefile.patch

@@ -15,7 +15,7 @@ index 0000000..f90baa1
 +++ b/Makefile
 @@ -0,0 +1,5 @@
 +MODULE:=$(shell basename $(CURDIR))
-+INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/transport_layer/include -I$(RIOTBASE)/sys/net/sixlowpan/include/ -I$(RIOTBASE)/sys/net/ieee802154/include -I$(RIOTBASE)/sys/net/net_help -I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
++INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/transport_layer/include -I$(RIOTBASE)/sys/net/sixlowpan/include/ -I$(RIOTBASE)/sys/net/ieee802154/include -I$(RIOTBASE)/sys/net/net_help -I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
 +CFLAGS += -DWITH_POSIX
 +
 +include $(RIOTBASE)/Makefile.base

pkg/openwsn/patches/02a-MAClow_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/02a-MAClow_stupidmac_Makefile.patch

@@ -4,7 +4,7 @@
 *** 0 ****
 --- 1,4 ----
 + MODULE:=$(shell basename $(CURDIR))
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 +
 + include $(RIOTBASE)/Makefile.base
 \ No newline at end of file

pkg/openwsn/patches/02b-MAChigh_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/03a-IPHC_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/03b-IPv6_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/04-TRAN_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_ohlone_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_rinfo_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_rwellknown_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_tcpecho_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_tcpinject_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_tcpprint_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_udpecho_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_udpinject_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_udplatency_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_udpprint_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_udprand_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/07-App_udpstorm_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

pkg/openwsn/patches/Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/cpu/msp430-common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/cpu/msp430-common/include -I$(RIOTBASE)/sys/net/include/
 +
 + INCLUDES += -I$(CURDIR)
 + INCLUDES += -I$(CURDIR)/02a-MAClow

pkg/openwsn/patches/cross-layers_Makefile.patch

@@ -9,7 +9,7 @@
 + OBJ = $(SRC:%.c=$(BINDIR)%.o)
 + DEP = $(SRC:%.c=$(BINDIR)%.d)
 +
-+ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
++ INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
 + INCLUDES += -I$(CURDIR)/02a-MAClow
 + INCLUDES += -I$(CURDIR)/02b-MAChigh
 + INCLUDES += -I$(CURDIR)/03a-IPHC

sys/Makefile.include

@@ -13,7 +13,7 @@ endif
 ifneq (,$(filter net_help,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
     USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x
-    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_ng/include
+    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_legacy/include
 endif
 ifneq (,$(filter net_if,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include

sys/auto_init/auto_init.c

@@ -98,7 +98,7 @@ void auto_init_net_if(void)
 #ifdef MODULE_CC1020
     transceivers |= TRANSCEIVER_CC1020;
 #endif
-#if MODULE_CC110X || MODULE_CC110X_NG
+#if MODULE_CC110X || MODULE_CC110X_LEGACY
     transceivers |= TRANSCEIVER_CC1100;
 #endif
 #ifdef MODULE_CC2420

sys/include/transceiver.h

@@ -32,8 +32,8 @@
 #endif
 #endif
 
-#ifdef MODULE_CC110X_NG
-#include "cc110x_ng.h"
+#ifdef MODULE_CC110X_LEGACY
+#include "cc110x_legacy.h"
 #ifndef TRANSCEIVER_DEFAULT
 #define TRANSCEIVER_DEFAULT TRANSCEIVER_CC1100
 #endif
@@ -91,7 +91,7 @@
 #define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH)
 #endif
 #endif
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
 #if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE)
 #undef PAYLOAD_SIZE
 #define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH)

sys/net/link_layer/net_if/Makefile

@@ -1,4 +1,4 @@
 INCLUDES += -I$(RIOTBASE)/drivers/include \
-			-I$(RIOTBASE)/drivers/cc110x_ng/include \
+			-I$(RIOTBASE)/drivers/cc110x_legacy/include \
 			-I$(RIOTBASE)/sys/net/include
 include $(RIOTBASE)/Makefile.base

sys/net/network_layer/sixlowpan/mac.c

@@ -256,7 +256,7 @@ int sixlowpan_mac_prepare_ieee802144_frame(
     ieee802154_frame_init(frame, (uint8_t *)&lowpan_mac_buf);
     memcpy(&lowpan_mac_buf[hdrlen], frame->payload, frame->payload_len);
     /* set FCS */
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
     fcs = (uint16_t *)&lowpan_mac_buf[frame->payload_len + hdrlen+1];
 #else
     fcs = (uint16_t *)&lowpan_mac_buf[frame->payload_len + hdrlen];

sys/shell/commands/sc_net_if.c

@@ -126,7 +126,7 @@ void create_usage(void)
 #ifdef MODULE_CC1020
          "        * cc1020\n"
 #endif
-#if MODULE_CC110X || MODULE_CC110X_NG
+#if MODULE_CC110X || MODULE_CC110X_LEGACY
          "        * cc1100\n"
 #endif
 #ifdef MODULE_CC2420

sys/shell/commands/sc_transceiver.c

@@ -32,8 +32,8 @@
 #define TEXT_SIZE           CC1100_MAX_DATA_LENGTH
 #define _TC_TYPE            TRANSCEIVER_CC1100
 
-#elif defined( MODULE_CC110X_NG )
-#include "cc110x_ng.h"
+#elif defined( MODULE_CC110X_LEGACY )
+#include "cc110x_legacy.h"
 #define TEXT_SIZE           CC1100_MAX_DATA_LENGTH
 #define _TC_TYPE            TRANSCEIVER_CC1100
 

sys/shell/commands/shell_commands.c

@@ -63,7 +63,7 @@ extern void _x86_lspci(int argc, char **argv);
 #ifdef DBG_IGNORE
 #define _TC_IGN
 #endif
-#if (defined(MODULE_CC110X_NG) || defined(MODULE_CC2420) || defined(MODULE_AT86RF231) || defined(MODULE_NATIVENET))
+#if (defined(MODULE_CC110X_LEGACY) || defined(MODULE_CC2420) || defined(MODULE_AT86RF231) || defined(MODULE_NATIVENET))
 #define _TC_ADDR
 #define _TC_CHAN
 #define _TC_MON

sys/transceiver/transceiver.c

@@ -34,8 +34,8 @@
 #include "cc110x.h"
 #endif
 
-#ifdef MODULE_CC110X_NG
-#include "cc110x_ng.h"
+#ifdef MODULE_CC110X_LEGACY
+#include "cc110x_legacy.h"
 #endif
 
 #ifdef MODULE_CC2420
@@ -108,7 +108,7 @@ char transceiver_stack[TRANSCEIVER_STACK_SIZE];
 /* function prototypes */
 static void *run(void *arg);
 static void receive_packet(uint16_t type, uint8_t pos);
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
 static void receive_cc110x_packet(radio_packet_t *trans_p);
 #endif
 #ifdef MODULE_CC110X
@@ -189,7 +189,7 @@ kernel_pid_t transceiver_start(void)
         puts("Error creating transceiver thread");
     }
 
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
     else if (transceivers & TRANSCEIVER_CC1100) {
         DEBUG("transceiver: Transceiver started for CC1100\n");
         cc110x_init(transceiver_pid);
@@ -443,7 +443,7 @@ static void receive_packet(uint16_t type, uint8_t pos)
         /* pass a null pointer if a packet from a undefined transceiver is
          * received */
         if (type == RCV_PKT_CC1100) {
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
             radio_packet_t *trans_p = &(transceiver_buffer[transceiver_buffer_pos]);
             receive_cc110x_packet(trans_p);
 #elif MODULE_CC110X
@@ -515,7 +515,7 @@ static void receive_packet(uint16_t type, uint8_t pos)
     }
 }
 
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
 /*
  * @brief process packets from CC1100
  *
@@ -728,7 +728,7 @@ static int8_t send_packet(transceiver_type_t t, void *pkt)
     DEBUG("\n");
 #endif
 
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
     cc110x_packet_t cc110x_pkt;
 #endif
 #ifdef MODULE_MC1322X
@@ -745,7 +745,7 @@ static int8_t send_packet(transceiver_type_t t, void *pkt)
 
     switch (t) {
         case TRANSCEIVER_CC1100:
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
             cc110x_pkt.length = p->length + CC1100_HEADER_LENGTH;
             cc110x_pkt.address = p->dst;
             cc110x_pkt.flags = 0;
@@ -815,7 +815,7 @@ static int32_t set_channel(transceiver_type_t t, void *channel)
 
     switch (t) {
         case TRANSCEIVER_CC1100:
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
             return cc110x_set_channel(c);
 #elif MODULE_CC110X
             return cc1100_set_channel(c);
@@ -860,7 +860,7 @@ static int32_t get_channel(transceiver_type_t t)
 {
     switch (t) {
         case TRANSCEIVER_CC1100:
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
             return cc110x_get_channel();
 #elif MODULE_CC110X
             return cc1100_get_channel();
@@ -985,7 +985,7 @@ static radio_address_t get_address(transceiver_type_t t)
 {
     switch (t) {
         case TRANSCEIVER_CC1100:
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
             return cc110x_get_address();
 #elif MODULE_CC110X
             return cc1100_get_address();
@@ -1034,7 +1034,7 @@ static radio_address_t set_address(transceiver_type_t t, void *address)
 
     switch (t) {
         case TRANSCEIVER_CC1100:
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
             return cc110x_set_address(addr);
 #elif MODULE_CC110X
             return cc1100_set_address(addr);
@@ -1134,7 +1134,7 @@ static void set_monitor(transceiver_type_t t, void *mode)
     (void) mode;
 
     switch (t) {
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
 
         case TRANSCEIVER_CC1100:
             cc110x_set_monitor(*((uint8_t *)mode));
@@ -1179,7 +1179,7 @@ void cc1100_packet_monitor(void *payload, int payload_size, protocol_t protocol,
 static void powerdown(transceiver_type_t t)
 {
     switch (t) {
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
 
         case TRANSCEIVER_CC1100:
             cc110x_switch_to_pwd();
@@ -1207,7 +1207,7 @@ static void powerdown(transceiver_type_t t)
 static void switch_to_rx(transceiver_type_t t)
 {
     switch (t) {
-#ifdef MODULE_CC110X_NG
+#ifdef MODULE_CC110X_LEGACY
 
         case TRANSCEIVER_CC1100:
             cc110x_switch_to_rx();