drivers - cc110x: rename cc110x to cc110x_legacy_csma

8 years ago · 53b0ad2be5
33 changed files with 68 additions and 68 deletions
--- a/boards/avsextrem/Makefile.include
+++ b/boards/avsextrem/Makefile.include
@ -5,7 +5,7 @@ ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
 	USEMODULE += transceiver
 endif

-ifneq (,$(filter cc110x,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy_csma,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/sys/net/include
 endif

--- a/boards/msba2-common/Makefile.dep
+++ b/boards/msba2-common/Makefile.dep
@ -1,4 +1,4 @@
-ifneq (,$(filter cc110x,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy_csma,$(USEMODULE)))
 	USEMODULE += gpioint
 endif

--- a/boards/msba2/Makefile
+++ b/boards/msba2/Makefile
@ -1,5 +1,5 @@
 MODULE =$(BOARD)_base
-INCLUDES += -I$(RIOTBASE)/drivers/cc110x
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x_legacy_csma

 DIRS = $(RIOTBOARD)/msba2-common

--- a/boards/pttu/Makefile
+++ b/boards/pttu/Makefile
@ -1,5 +1,5 @@
 MODULE =$(BOARD)_base
-INCLUDES += -I$(RIOTBASE)/drivers/cc110x
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x_legacy_csma

 DIRS = $(RIOTBOARD)/msba2-common

--- a/boards/pttu/Makefile.include
+++ b/boards/pttu/Makefile.include
@ -2,7 +2,7 @@ export INCLUDES += -I$(RIOTBOARD)/pttu/include

 # Enable this after fixing https://github.com/RIOT-OS/RIOT/issues/659
 #ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-#	USEMODULE += cc110x
+#	USEMODULE += cc110x_legacy_csma
 #	USEMODULE += transceiver
 #endif

--- a/drivers/Makefile
+++ b/drivers/Makefile
@ -10,8 +10,8 @@ endif
 ifneq (,$(filter ltc4150,$(USEMODULE)))
    DIRS += ltc4150
 endif
-ifneq (,$(filter cc110x,$(USEMODULE)))
-    DIRS += cc110x
+ifneq (,$(filter cc110x_legacy_csma,$(USEMODULE)))
+    DIRS += cc110x_legacy_csma
 endif
 ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
    DIRS += cc110x_legacy
--- a/drivers/Makefile.include
+++ b/drivers/Makefile.include
@ -1,8 +1,8 @@
 ifneq (,$(filter cc2420,$(USEMODULE)))
    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc2420/include
 endif
-ifneq (,$(filter cc110x,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x/include
+ifneq (,$(filter cc110x_legacy_csma,$(USEMODULE)))
+    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_legacy_csma/include
 endif
 ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_legacy/include
--- a/drivers/cc110x_legacy_csma/Makefile
+++ b/drivers/cc110x_legacy_csma/Makefile
--- a/drivers/cc110x_legacy_csma/arch_cc1100.h
+++ b/drivers/cc110x_legacy_csma/arch_cc1100.h
--- a/drivers/cc110x_legacy_csma/cc1100-csmaca-mac.c
+++ b/drivers/cc110x_legacy_csma/cc1100-csmaca-mac.c
@ -8,7 +8,7 @@

 /**
 * @file
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @brief       ScatterWeb MSB-A2 mac-layer
 *
 * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
--- a/drivers/cc110x_legacy_csma/cc1100-csmaca-mac.h
+++ b/drivers/cc110x_legacy_csma/cc1100-csmaca-mac.h
@ -8,7 +8,7 @@

 /**
 * @file
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @brief       ScatterWeb MSB-A2 mac-layer
 *
 * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
--- a/drivers/cc110x_legacy_csma/cc1100-defaultSettings.c
+++ b/drivers/cc110x_legacy_csma/cc1100-defaultSettings.c
@ -7,7 +7,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/cc110x_legacy_csma/cc1100-defaultSettings.h
+++ b/drivers/cc110x_legacy_csma/cc1100-defaultSettings.h
@ -10,7 +10,7 @@
 #define CC1100_DEFAULTSETTINGS_H

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/cc110x_legacy_csma/cc1100-internal.h
+++ b/drivers/cc110x_legacy_csma/cc1100-internal.h
@ -14,7 +14,7 @@ extern "C" {
 #endif

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/cc110x_legacy_csma/cc1100.c
+++ b/drivers/cc110x_legacy_csma/cc1100.c
@ -9,7 +9,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/cc110x_legacy_csma/cc1100.h
+++ b/drivers/cc110x_legacy_csma/cc1100.h
@ -7,7 +7,7 @@
 */

 /**
- * @defgroup        drivers_cc110x CC110x
+ * @defgroup        drivers_cc110x_legacy_csma CC110X_LEGACY_CSMA
 * @ingroup         drivers
 * @brief           Driver for Texas Instruments CC110x (including CMSA/CA MAC)
 *
@ -27,7 +27,7 @@
 #define CC1100_H

 #include <stdbool.h>
-#include "cc110x.h"
+#include "cc110x_legacy_csma.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/cc110x_legacy_csma/cc1100_phy.c
+++ b/drivers/cc110x_legacy_csma/cc1100_phy.c
@ -7,7 +7,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/cc110x_legacy_csma/cc1100_phy.h
+++ b/drivers/cc110x_legacy_csma/cc1100_phy.h
@ -7,7 +7,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

@ -29,7 +29,7 @@
 #include <stdint.h>
 //#include "cc1100.h"
 #include "cc1100-internal.h"
-#include "cc110x.h"
+#include "cc110x_legacy_csma.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/cc110x_legacy_csma/cc1100_spi.c
+++ b/drivers/cc110x_legacy_csma/cc1100_spi.c
@ -7,7 +7,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/cc110x_legacy_csma/cc1100_spi.h
+++ b/drivers/cc110x_legacy_csma/cc1100_spi.h
@ -7,7 +7,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/drivers/include/cc110x.h
+++ b/drivers/include/cc110x.h
@ -1,14 +0,0 @@
-#ifndef CC110X_H
-#define CC110X_H
-
-#include "cc110x/cc1100-interface.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CC110X_H */
--- a/drivers/include/cc110x_legacy_csma.h
+++ b/drivers/include/cc110x_legacy_csma.h
@ -0,0 +1,14 @@
+#ifndef CC110X_LEGACY_CSMA_H
+#define CC110X_LEGACY_CSMA_H
+
+#include "cc110x_legacy_csma/cc1100-interface.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CC110X_LEGACY_CSMA_H */
--- a/drivers/include/cc110x_legacy_csma/cc1100-interface.h
+++ b/drivers/include/cc110x_legacy_csma/cc1100-interface.h
@ -7,7 +7,7 @@
 */

 /**
- * @ingroup     dev_cc110x
+ * @ingroup     dev_cc110x_legacy_csma
 * @{
 */

--- a/sys/Makefile.include
+++ b/sys/Makefile.include
@ -12,7 +12,7 @@ ifneq (,$(filter udp,$(USEMODULE)))
 endif
 ifneq (,$(filter net_help,$(USEMODULE)))
    USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
-    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x
+    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_legacy_csma
    USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x_legacy/include
 endif
 ifneq (,$(filter net_if,$(USEMODULE)))
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@ -27,8 +27,8 @@
 #include "gpioint.h"
 #endif

-#ifdef MODULE_CC110X
-#include "cc110x.h"
+#ifdef MODULE_CC110X_LEGACY_CSMA
+#include "cc110x_legacy_csma.h"
 #endif

 #ifdef MODULE_LTC4150
@ -98,7 +98,7 @@ void auto_init_net_if(void)
 #ifdef MODULE_CC1020
    transceivers |= TRANSCEIVER_CC1020;
 #endif
-#if MODULE_CC110X || MODULE_CC110X_LEGACY
+#if MODULE_CC110X_LEGACY_CSMA || MODULE_CC110X_LEGACY
    transceivers |= TRANSCEIVER_CC1100;
 #endif
 #ifdef MODULE_CC2420
@ -208,7 +208,7 @@ void auto_init(void)
    DEBUG("Auto init gpioint module.\n");
    gpioint_init();
 #endif
-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
    DEBUG("Auto init CC1100 module.\n");
 #ifndef MODULE_TRANSCEIVER
    cc1100_init();
--- a/sys/include/transceiver.h
+++ b/sys/include/transceiver.h
@ -25,8 +25,8 @@
 /* supported transceivers *
 * NOTE: necessary to include here again due to
 * https://github.com/RIOT-OS/RIOT/issues/117 */
-#ifdef MODULE_CC110X
-#include "cc110x.h"
+#ifdef MODULE_CC110X_LEGACY_CSMA
+#include "cc110x_legacy_csma.h"
 #ifndef TRANSCEIVER_DEFAULT
 #define TRANSCEIVER_DEFAULT TRANSCEIVER_CC1100
 #endif
@ -85,7 +85,7 @@
 #ifndef PAYLOAD_SIZE
 #define PAYLOAD_SIZE  (0)
 #endif
-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
 #if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE)
 #undef PAYLOAD_SIZE
 #define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH)
--- a/sys/ping/ping.c
+++ b/sys/ping/ping.c
@ -19,7 +19,7 @@
 #include "thread.h"
 #include "msg.h"

-#include "cc110x/cc1100.h"
+#include "cc110x_legacy_csma/cc1100.h"
 #include "lpc2387.h"

 #include "vtimer.h"
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@ -8,9 +8,9 @@ endif
 ifneq (,$(filter transceiver,$(USEMODULE)))
 	SRC += sc_transceiver.c
 endif
-ifneq (,$(filter cc110x,$(USEMODULE)))
+ifneq (,$(filter cc110x_legacy_csma,$(USEMODULE)))
 	ifeq (,$(filter transceiver,$(USEMODULE)))
-		SRC += sc_cc1100.c
+		SRC += sc_cc110x_legacy_csma.c
 	endif
 endif
 ifneq (,$(filter net_if,$(USEMODULE)))
--- a/sys/shell/commands/sc_cc110x_legacy_csma.c
+++ b/sys/shell/commands/sc_cc110x_legacy_csma.c
@ -9,7 +9,7 @@
 *
 * @ingroup shell_commands
 * @{
- * @file    sc_cc1100.c
+ * @file    sc_cc110x_legacy_csma.c
 * @brief   provides shell commands to configure the cc110x driver
 * @author  Oliver Hahm <oliver.hahm@inria.fr>
 * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "cc110x.h"
+#include "cc110x_legacy_csma.h"


 void _cc110x_get_set_address_handler(int argc, char **argv)
--- a/sys/shell/commands/sc_net_if.c
+++ b/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_LEGACY
+#if MODULE_CC110X_LEGACY_CSMA || MODULE_CC110X_LEGACY
         "        * cc1100\n"
 #endif
 #ifdef MODULE_CC2420
--- a/sys/shell/commands/sc_transceiver.c
+++ b/sys/shell/commands/sc_transceiver.c
@ -27,8 +27,8 @@
 #include "transceiver.h"
 #include "msg.h"

-#if   defined( MODULE_CC110X )
-#include "cc110x.h"
+#if   defined( MODULE_CC110X_LEGACY_CSMA )
+#include "cc110x_legacy_csma.h"
 #define TEXT_SIZE           CC1100_MAX_DATA_LENGTH
 #define _TC_TYPE            TRANSCEIVER_CC1100

--- a/sys/shell/commands/shell_commands.c
+++ b/sys/shell/commands/shell_commands.c
@ -74,7 +74,7 @@ extern void _x86_lspci(int argc, char **argv);
 #define _TC_PAN
 #endif
 #else /* WITHOUT MODULE_TRANSCEIVER */
-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
 extern void _cc110x_get_set_address_handler(int argc, char **argv);
 extern void _cc110x_get_set_channel_handler(int argc, char **argv);
 #endif
@ -172,7 +172,7 @@ const shell_command_t _shell_command_list[] = {
    {"ign", "Ignore the address at the transceiver", _transceiver_set_ignore_handler},
 #endif
 #else /* WITHOUT MODULE_TRANSCEIVER */
-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
    {"addr", "Gets or sets the address for the CC1100 transceiver", _cc110x_get_set_address_handler},
    {"chan", "Gets or sets the channel for the CC1100 transceiver", _cc110x_get_set_channel_handler},
 #endif
--- a/sys/transceiver/transceiver.c
+++ b/sys/transceiver/transceiver.c
@ -30,8 +30,8 @@
 #include "transceiver.h"

 /* supported transceivers */
-#ifdef MODULE_CC110X
-#include "cc110x.h"
+#ifdef MODULE_CC110X_LEGACY_CSMA
+#include "cc110x_legacy_csma.h"
 #endif

 #ifdef MODULE_CC110X_LEGACY
@ -93,7 +93,7 @@ volatile kernel_pid_t transceiver_pid = KERNEL_PID_UNDEF; ///< the transceiver t
 static volatile uint8_t rx_buffer_pos = 0;
 static volatile uint8_t transceiver_buffer_pos = 0;

-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
 void *cc1100_payload;
 int cc1100_payload_size;
 packet_info_t *cc1100_packet_info;
@ -111,7 +111,7 @@ static void receive_packet(uint16_t type, uint8_t pos);
 #ifdef MODULE_CC110X_LEGACY
 static void receive_cc110x_packet(radio_packet_t *trans_p);
 #endif
-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
 void cc1100_packet_monitor(void *payload, int payload_size, protocol_t protocol, packet_info_t *packet_info);
 void receive_cc1100_packet(radio_packet_t *trans_p);
 #endif
@ -196,7 +196,7 @@ kernel_pid_t transceiver_start(void)
    }

 #endif
-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
    else if (transceivers & TRANSCEIVER_CC1100) {
        DEBUG("transceiver: Transceiver started for CC1100\n");
        cc1100_init();
@ -446,7 +446,7 @@ static void receive_packet(uint16_t type, uint8_t pos)
 #ifdef MODULE_CC110X_LEGACY
            radio_packet_t *trans_p = &(transceiver_buffer[transceiver_buffer_pos]);
            receive_cc110x_packet(trans_p);
-#elif MODULE_CC110X
+#elif MODULE_CC110X_LEGACY_CSMA
            radio_packet_t *trans_p = &(transceiver_buffer[transceiver_buffer_pos]);
            receive_cc1100_packet(trans_p);
 #endif
@ -541,7 +541,7 @@ static void receive_cc110x_packet(radio_packet_t *trans_p)
 }
 #endif

-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
 void receive_cc1100_packet(radio_packet_t *trans_p)
 {
    dINT();
@ -751,7 +751,7 @@ static int8_t send_packet(transceiver_type_t t, void *pkt)
            cc110x_pkt.flags = 0;
            memcpy(cc110x_pkt.data, p->data, p->length);
            res = cc110x_send(&cc110x_pkt);
-#elif MODULE_CC110X
+#elif MODULE_CC110X_LEGACY_CSMA
            memcpy(cc1100_pkt, p->data, p->length);

            res = cc1100_send_csmaca(p->dst, 4, 0, (char *) cc1100_pkt, p->length);
@ -817,7 +817,7 @@ static int32_t set_channel(transceiver_type_t t, void *channel)
        case TRANSCEIVER_CC1100:
 #ifdef MODULE_CC110X_LEGACY
            return cc110x_set_channel(c);
-#elif MODULE_CC110X
+#elif MODULE_CC110X_LEGACY_CSMA
            return cc1100_set_channel(c);
 #else
            return -1;
@ -862,7 +862,7 @@ static int32_t get_channel(transceiver_type_t t)
        case TRANSCEIVER_CC1100:
 #ifdef MODULE_CC110X_LEGACY
            return cc110x_get_channel();
-#elif MODULE_CC110X
+#elif MODULE_CC110X_LEGACY_CSMA
            return cc1100_get_channel();
 #else
            return -1;
@ -987,7 +987,7 @@ static radio_address_t get_address(transceiver_type_t t)
        case TRANSCEIVER_CC1100:
 #ifdef MODULE_CC110X_LEGACY
            return cc110x_get_address();
-#elif MODULE_CC110X
+#elif MODULE_CC110X_LEGACY_CSMA
            return cc1100_get_address();
 #else
            return 0; /* XXX see TODO above */
@ -1036,7 +1036,7 @@ static radio_address_t set_address(transceiver_type_t t, void *address)
        case TRANSCEIVER_CC1100:
 #ifdef MODULE_CC110X_LEGACY
            return cc110x_set_address(addr);
-#elif MODULE_CC110X
+#elif MODULE_CC110X_LEGACY_CSMA
            return cc1100_set_address(addr);
 #else
            return 0; /* XXX see TODO above */
@ -1163,7 +1163,7 @@ static void set_monitor(transceiver_type_t t, void *mode)
    }
 }

-#ifdef MODULE_CC110X
+#ifdef MODULE_CC110X_LEGACY_CSMA
 void cc1100_packet_monitor(void *payload, int payload_size, protocol_t protocol, packet_info_t *packet_info)
 {
    (void) protocol;