deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove legacy sniffer configuration: zoul

Browse source
This commit is contained in:
George Oikonomou 2016-07-24 04:28:31 +01:00
parent 35c37f356c
commit d7028652fe
1 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
platform/zoul/contiki-conf.h
View file

@ -197,10 +197,6 @@ typedef uint32_t rtimer_clock_t;
#define SLIP_ARCH_CONF_USB 0 /**< SLIP over UART by default */ #define SLIP_ARCH_CONF_USB 0 /**< SLIP over UART by default */
#endif #endif
#ifndef CC2538_RF_CONF_SNIFFER_USB
#define CC2538_RF_CONF_SNIFFER_USB 0 /**< Sniffer out over UART by default */
#endif
#ifndef DBG_CONF_USB #ifndef DBG_CONF_USB
#define DBG_CONF_USB 0 /**< All debugging over UART by default */ #define DBG_CONF_USB 0 /**< All debugging over UART by default */
#endif #endif
@ -215,12 +211,6 @@ typedef uint32_t rtimer_clock_t;
#endif #endif
#endif #endif
#if !CC2538_RF_CONF_SNIFFER_USB
#ifndef CC2538_RF_CONF_SNIFFER_UART
#define CC2538_RF_CONF_SNIFFER_UART 0 /**< UART to use with sniffer */
#endif
#endif
#if !DBG_CONF_USB #if !DBG_CONF_USB
#ifndef DBG_CONF_UART #ifndef DBG_CONF_UART
#define DBG_CONF_UART 0 /**< UART to use for debugging */ #define DBG_CONF_UART 0 /**< UART to use for debugging */
@ -247,15 +237,6 @@ typedef uint32_t rtimer_clock_t;
#endif #endif
#endif #endif
/*
* When set, the radio turns off address filtering and sends all captured
* frames down a peripheral (UART or USB, depending on the value of
* CC2538_RF_CONF_SNIFFER_USB)
*/
#ifndef CC2538_RF_CONF_SNIFFER
#define CC2538_RF_CONF_SNIFFER 0
#endif
/** /**
* \brief Define this as 1 to build a headless node. * \brief Define this as 1 to build a headless node.
* *
@ -276,12 +257,6 @@ typedef uint32_t rtimer_clock_t;
#undef STARTUP_CONF_VERBOSE #undef STARTUP_CONF_VERBOSE
#define STARTUP_CONF_VERBOSE 0 #define STARTUP_CONF_VERBOSE 0
/* Little sanity check: We can't have quiet sniffers */
#if CC2538_RF_CONF_SNIFFER
#error "CC2538_RF_CONF_SNIFFER == 1 and CC2538_CONF_QUIET == 1"
#error "These values are conflicting. Please set either to 0"
#endif
#endif /* CC2538_CONF_QUIET */ #endif /* CC2538_CONF_QUIET */
/** /**
@ -290,8 +265,7 @@ typedef uint32_t rtimer_clock_t;
#ifndef USB_SERIAL_CONF_ENABLE #ifndef USB_SERIAL_CONF_ENABLE
#define USB_SERIAL_CONF_ENABLE \ #define USB_SERIAL_CONF_ENABLE \
((SLIP_ARCH_CONF_USB & SLIP_ARCH_CONF_ENABLED) | \ ((SLIP_ARCH_CONF_USB & SLIP_ARCH_CONF_ENABLED) | \
DBG_CONF_USB | \ DBG_CONF_USB)
(CC2538_RF_CONF_SNIFFER & CC2538_RF_CONF_SNIFFER_USB))
#endif #endif
/* /*
@ -311,9 +285,6 @@ typedef uint32_t rtimer_clock_t;
#define UART_IN_USE_BY_SLIP(u) (SLIP_ARCH_CONF_ENABLED && \ #define UART_IN_USE_BY_SLIP(u) (SLIP_ARCH_CONF_ENABLED && \
!SLIP_ARCH_CONF_USB && \ !SLIP_ARCH_CONF_USB && \
SLIP_ARCH_CONF_UART == (u)) SLIP_ARCH_CONF_UART == (u))
#define UART_IN_USE_BY_RF_SNIFFER(u) (CC2538_RF_CONF_SNIFFER && \
!CC2538_RF_CONF_SNIFFER_USB && \
CC2538_RF_CONF_SNIFFER_UART == (u))
#define UART_IN_USE_BY_DBG(u) (!DBG_CONF_USB && DBG_CONF_UART == (u)) #define UART_IN_USE_BY_DBG(u) (!DBG_CONF_USB && DBG_CONF_UART == (u))
#define UART_IN_USE_BY_UART1(u) (UART1_CONF_UART == (u)) #define UART_IN_USE_BY_UART1(u) (UART1_CONF_UART == (u))
@ -321,7 +292,6 @@ typedef uint32_t rtimer_clock_t;
UART_CONF_ENABLE && \ UART_CONF_ENABLE && \
(UART_IN_USE_BY_SERIAL_LINE(u) || \ (UART_IN_USE_BY_SERIAL_LINE(u) || \
UART_IN_USE_BY_SLIP(u) || \ UART_IN_USE_BY_SLIP(u) || \
UART_IN_USE_BY_RF_SNIFFER(u) || \
UART_IN_USE_BY_DBG(u) || \ UART_IN_USE_BY_DBG(u) || \
UART_IN_USE_BY_UART1(u)) \ UART_IN_USE_BY_UART1(u)) \
) )