mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-25 14:33:52 +01:00
Merge pull request #655 from OlegHahm/cc110x_header
include cc110x.h instead of deprecated interface.h
This commit is contained in:
commit
49c6a3af55
@ -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
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#define CC1100_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "cc1100-interface.h"
|
||||
#include "cc110x.h"
|
||||
|
||||
/**
|
||||
* @name Defines used as state values for state machine
|
||||
|
||||
@ -36,7 +36,7 @@ and Telematics group (http://cst.mi.fu-berlin.de).
|
||||
#include <stdint.h>
|
||||
//#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.
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_CC110X
|
||||
#include "cc1100-interface.h"
|
||||
#include "cc110x.h"
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_LTC4150
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
/* supported transceivers */
|
||||
#ifdef MODULE_CC110X
|
||||
#include "cc1100-interface.h"
|
||||
#include "cc110x.h"
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_CC110X_NG
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user