giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify radio driver configuration

Browse Source
This commit is contained in:
Simon Duquennoy 2017-09-08 21:24:59 +02:00
parent 0aa44c3c22
commit 117dbe44c8
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os/contiki-default-conf.h
View File

@ -39,13 +39,6 @@
* configuration, as defined in contiki-conf.h * configuration, as defined in contiki-conf.h
*/ */
/* NETSTACK_CONF_RADIO specifies the radio driver. The radio driver
typically depends on the radio used on the target hardware. */
#ifndef NETSTACK_CONF_RADIO
#define NETSTACK_CONF_RADIO nullradio_driver
/* #define NETSTACK_CONF_RADIO cc2420_driver */
#endif /* NETSTACK_CONF_RADIO */
/* NETSTACK_CONF_FRAMER specifies the over-the-air frame format used /* NETSTACK_CONF_FRAMER specifies the over-the-air frame format used
by Contiki radio packets. For IEEE 802.15.4 radios, use the by Contiki radio packets. For IEEE 802.15.4 radios, use the
framer_802154 driver. */ framer_802154 driver. */

3
os/net/netstack.h
View File

@ -69,13 +69,12 @@
#error Unknown MAC configuration #error Unknown MAC configuration
#endif #endif
#ifndef NETSTACK_RADIO /* Radio driver configuration. Most often set by the platform. */
#ifdef NETSTACK_CONF_RADIO #ifdef NETSTACK_CONF_RADIO
#define NETSTACK_RADIO NETSTACK_CONF_RADIO #define NETSTACK_RADIO NETSTACK_CONF_RADIO
#else /* NETSTACK_CONF_RADIO */ #else /* NETSTACK_CONF_RADIO */
#define NETSTACK_RADIO nullradio_driver #define NETSTACK_RADIO nullradio_driver
#endif /* NETSTACK_CONF_RADIO */ #endif /* NETSTACK_CONF_RADIO */
#endif /* NETSTACK_RADIO */
#ifndef NETSTACK_FRAMER #ifndef NETSTACK_FRAMER
#ifdef NETSTACK_CONF_FRAMER #ifdef NETSTACK_CONF_FRAMER