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

Simplify framer configuration

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

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

@ -32,21 +32,6 @@
#ifndef CONTIKI_DEFAULT_CONF_H #ifndef CONTIKI_DEFAULT_CONF_H
#define CONTIKI_DEFAULT_CONF_H #define CONTIKI_DEFAULT_CONF_H
/*---------------------------------------------------------------------------*/
/* Netstack configuration
*
* The netstack configuration is typically overridden by the platform
* configuration, as defined in contiki-conf.h
*/
/* NETSTACK_CONF_FRAMER specifies the over-the-air frame format used
by Contiki radio packets. For IEEE 802.15.4 radios, use the
framer_802154 driver. */
#ifndef NETSTACK_CONF_FRAMER
#define NETSTACK_CONF_FRAMER framer_802154
/* #define NETSTACK_CONF_FRAMER framer_802154 */
#endif /* NETSTACK_CONF_FRAMER */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Packet buffer size options. /* Packet buffer size options.
* *

4
os/net/netstack.h
View File

@ -76,13 +76,13 @@
#define NETSTACK_RADIO nullradio_driver #define NETSTACK_RADIO nullradio_driver
#endif /* NETSTACK_CONF_RADIO */ #endif /* NETSTACK_CONF_RADIO */
#ifndef NETSTACK_FRAMER /* Framer selection. The framer is used by the MAC implementation
to build and parse frames. */
#ifdef NETSTACK_CONF_FRAMER #ifdef NETSTACK_CONF_FRAMER
#define NETSTACK_FRAMER NETSTACK_CONF_FRAMER #define NETSTACK_FRAMER NETSTACK_CONF_FRAMER
#else /* NETSTACK_CONF_FRAMER */ #else /* NETSTACK_CONF_FRAMER */
#define NETSTACK_FRAMER framer_802154 #define NETSTACK_FRAMER framer_802154
#endif /* NETSTACK_CONF_FRAMER */ #endif /* NETSTACK_CONF_FRAMER */
#endif /* NETSTACK_FRAMER */
#include "net/mac/mac.h" #include "net/mac/mac.h"
#include "net/mac/framer/framer.h" #include "net/mac/framer/framer.h"