From 30b6c165127b501646999c0ba4d6be4cd9576642 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 7 Feb 2014 18:26:21 +0100 Subject: [PATCH] include cc110x.h instead of deprecated interface.h --- drivers/cc110x/cc1100-csmaca-mac.h | 1 - drivers/cc110x/cc1100.h | 2 +- drivers/cc110x/cc1100_phy.h | 2 +- sys/auto_init/auto_init.c | 2 +- sys/include/transceiver.h | 2 +- sys/shell/commands/sc_transceiver.c | 2 +- sys/transceiver/transceiver.c | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/cc110x/cc1100-csmaca-mac.h b/drivers/cc110x/cc1100-csmaca-mac.h index 278d7c0e3..e5c0d815c 100644 --- a/drivers/cc110x/cc1100-csmaca-mac.h +++ b/drivers/cc110x/cc1100-csmaca-mac.h @@ -28,7 +28,6 @@ and Telematics group (http://cst.mi.fu-berlin.de). #ifndef CC1100_CSMACA_MAC_ #define CC1100_CSMACA_MAC_ -#include "cc1100-interface.h" #include "cc1100-defaultSettings.h" //#define CSMACA_MAC_AGGRESSIVE_MODE // MAC aggressive mode on/off switch diff --git a/drivers/cc110x/cc1100.h b/drivers/cc110x/cc1100.h index 265127f83..bd34c9b0b 100644 --- a/drivers/cc110x/cc1100.h +++ b/drivers/cc110x/cc1100.h @@ -34,7 +34,7 @@ #define CC1100_H #include -#include "cc1100-interface.h" +#include "cc110x.h" /** * @name Defines used as state values for state machine diff --git a/drivers/cc110x/cc1100_phy.h b/drivers/cc110x/cc1100_phy.h index 12eb147ab..7e1657c84 100644 --- a/drivers/cc110x/cc1100_phy.h +++ b/drivers/cc110x/cc1100_phy.h @@ -36,7 +36,7 @@ and Telematics group (http://cst.mi.fu-berlin.de). #include //#include "cc1100.h" #include "cc1100-internal.h" -#include "cc1100-interface.h" +#include "cc110x.h" #define MAX_DATA_LENGTH (0x3A) ///< Maximum data length of layer 0 = 58 Bytes. diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c index ef752455a..3fc907773 100644 --- a/sys/auto_init/auto_init.c +++ b/sys/auto_init/auto_init.c @@ -32,7 +32,7 @@ #endif #ifdef MODULE_CC110X -#include "cc1100-interface.h" +#include "cc110x.h" #endif #ifdef MODULE_LTC4150 diff --git a/sys/include/transceiver.h b/sys/include/transceiver.h index 4959bb696..cafad10bd 100644 --- a/sys/include/transceiver.h +++ b/sys/include/transceiver.h @@ -14,7 +14,7 @@ * NOTE: necessary to include here again due to * https://github.com/RIOT-OS/RIOT/issues/117 */ #ifdef MODULE_CC110X -#include "cc1100-interface.h" +#include "cc110x.h" #endif #ifdef MODULE_CC110X_NG diff --git a/sys/shell/commands/sc_transceiver.c b/sys/shell/commands/sc_transceiver.c index ee0fdff39..c2ea7ecb2 100644 --- a/sys/shell/commands/sc_transceiver.c +++ b/sys/shell/commands/sc_transceiver.c @@ -25,7 +25,7 @@ #include "msg.h" #if defined( MODULE_CC110X ) -#include "cc1100-interface.h" +#include "cc110x.h" #define TEXT_SIZE CC1100_MAX_DATA_LENGTH #define _TC_TYPE TRANSCEIVER_CC1100 diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c index 29157709f..e5bd66b43 100644 --- a/sys/transceiver/transceiver.c +++ b/sys/transceiver/transceiver.c @@ -31,7 +31,7 @@ /* supported transceivers */ #ifdef MODULE_CC110X -#include "cc1100-interface.h" +#include "cc110x.h" #endif #ifdef MODULE_CC110X_NG