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

Remove built-in sniffer support: CC2530

Browse source
This commit is contained in:
George Oikonomou 2016-07-24 03:49:15 +01:00
parent 1a4947499c
commit 0de1dc1025
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cpu/cc253x/dev/cc2530-rf.c
View file

@ -101,11 +101,6 @@
#define CC2530_RF_TX_POWER_TXCTRL_MIN_VAL 0x09 /* Value for min TX Power */ #define CC2530_RF_TX_POWER_TXCTRL_MIN_VAL 0x09 /* Value for min TX Power */
#define CC2530_RF_TX_POWER_TXCTRL_DEF_VAL 0x69 /* Reset Value */ #define CC2530_RF_TX_POWER_TXCTRL_DEF_VAL 0x69 /* Reset Value */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if CC2530_RF_CONF_HEXDUMP
#include "dev/io-arch.h"
static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 }; /* Snif */
#endif
/*---------------------------------------------------------------------------*/
#ifdef CC2530_RF_CONF_AUTOACK #ifdef CC2530_RF_CONF_AUTOACK
#define CC2530_RF_AUTOACK CC2530_RF_CONF_AUTOACK #define CC2530_RF_AUTOACK CC2530_RF_CONF_AUTOACK
#else #else
@ -531,15 +526,6 @@ read(void *buf, unsigned short bufsize)
return 0; return 0;
} }
#if CC2530_RF_CONF_HEXDUMP
/* If we reach here, chances are the FIFO is holding a valid frame */
io_arch_writeb(magic[0]);
io_arch_writeb(magic[1]);
io_arch_writeb(magic[2]);
io_arch_writeb(magic[3]);
io_arch_writeb(len);
#endif
RF_RX_LED_ON(); RF_RX_LED_ON();
PUTSTRING("RF: read (0x"); PUTSTRING("RF: read (0x");
@ -548,9 +534,6 @@ read(void *buf, unsigned short bufsize)
len -= CHECKSUM_LEN; len -= CHECKSUM_LEN;
for(i = 0; i < len; ++i) { for(i = 0; i < len; ++i) {
((unsigned char *)(buf))[i] = RFD; ((unsigned char *)(buf))[i] = RFD;
#if CC2530_RF_CONF_HEXDUMP
io_arch_writeb(((unsigned char *)(buf))[i]);
#endif
PUTHEX(((unsigned char *)(buf))[i]); PUTHEX(((unsigned char *)(buf))[i]);
} }
PUTSTRING("\n"); PUTSTRING("\n");
@ -559,12 +542,6 @@ read(void *buf, unsigned short bufsize)
rssi = ((int8_t) RFD) - RSSI_OFFSET; rssi = ((int8_t) RFD) - RSSI_OFFSET;
crc_corr = RFD; crc_corr = RFD;
#if CC2530_RF_CONF_HEXDUMP
io_arch_writeb(rssi);
io_arch_writeb(crc_corr);
io_arch_flush();
#endif
/* MS bit CRC OK/Not OK, 7 LS Bits, Correlation value */ /* MS bit CRC OK/Not OK, 7 LS Bits, Correlation value */
if(crc_corr & CRC_BIT_MASK) { if(crc_corr & CRC_BIT_MASK) {
packetbuf_set_attr(PACKETBUF_ATTR_RSSI, rssi); packetbuf_set_attr(PACKETBUF_ATTR_RSSI, rssi);

11
platform/cc2530dk/contiki-conf.h
View file

@ -85,17 +85,6 @@
#define UART0_CONF_WITH_INPUT 1 #define UART0_CONF_WITH_INPUT 1
#endif #endif
/* Output all captured frames over the UART in hexdump format */
#ifndef CC2530_RF_CONF_HEXDUMP
#define CC2530_RF_CONF_HEXDUMP 0
#endif
#if CC2530_RF_CONF_HEXDUMP
/* We need UART1 output */
#undef UART_ZERO_CONF_ENABLE
#define UART_ZERO_CONF_ENABLE 1
#endif
/* Code Shortcuts */ /* Code Shortcuts */
/* /*
* When set, this directive also configures the following bypasses: * When set, this directive also configures the following bypasses: