New default: CSMA over 802.15.4

core/contiki-default-conf.h

@@ -50,7 +50,7 @@
    by Contiki radio packets. For IEEE 802.15.4 radios, use the
    framer_802154 driver. */
 #ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER framer_nullmac
+#define NETSTACK_CONF_FRAMER framer_802154
 /* #define NETSTACK_CONF_FRAMER framer_802154 */
 #endif /* NETSTACK_CONF_FRAMER */
 
@@ -66,7 +66,7 @@
    functionality. The csma_driver is the default CSMA MAC layer, but
    is not compatible with all radios. */
 #ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC   nullmac_driver
+#define NETSTACK_CONF_MAC   csma_driver
 /* #define NETSTACK_CONF_MAC   csma_driver */
 #endif /* NETSTACK_CONF_MAC */
 

drivers/platform/cc2538dk/contiki-conf.h

@@ -253,31 +253,11 @@ typedef uint32_t rtimer_clock_t;
 /* board.h assumes that basic configuration is done */
 #include "board.h"
 /*---------------------------------------------------------------------------*/
-/**
- * \name Network Stack Configuration
- *
- * @{
- */
-#ifndef NETSTACK_CONF_NETWORK
-#define NETSTACK_CONF_NETWORK sicslowpan_driver
-#endif /* NETSTACK_CONF_NETWORK */
-
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif
 
 /* Configure NullRDC for when it's selected */
 #define NULLRDC_802154_AUTOACK                  1
 #define NULLRDC_802154_AUTOACK_HW               1
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #define NETSTACK_CONF_RADIO   cc2538_rf_driver
 /** @} */
 /*---------------------------------------------------------------------------*/

drivers/platform/cooja/contiki-conf.h

@@ -73,12 +73,8 @@
 #define NULLRDC_CONF_AFTER_ACK_DETECTED_WAIT_TIME 0
 
 
-/* Network setup for IPv6 */
+/* Radio setup */
-#define NETSTACK_CONF_NETWORK       sicslowpan_driver
-#define NETSTACK_CONF_MAC           csma_driver
-#define NETSTACK_CONF_RDC           nullrdc_driver
 #define NETSTACK_CONF_RADIO         cooja_radio_driver
-#define NETSTACK_CONF_FRAMER        framer_802154
 
 #else /* NETSTACK_CONF_WITH_IPV6 */
 
@@ -101,12 +97,8 @@
 
 
 
-/* Network setup for IPv6 */
+/* Radio setup */
-#define NETSTACK_CONF_NETWORK       sicslowpan_driver
-#define NETSTACK_CONF_MAC           csma_driver
-#define NETSTACK_CONF_RDC           nullrdc_driver
 #define NETSTACK_CONF_RADIO         cooja_radio_driver
-#define NETSTACK_CONF_FRAMER        framer_802154
 #define NETSTACK_CONF_WITH_IPV6               1
 
 #define LINKADDR_CONF_SIZE          8

drivers/platform/jn516x/contiki-conf.h

@@ -43,22 +43,10 @@
 #define CCM_STAR_CONF ccm_star_driver_jn516x
 #endif /* CCM_STAR_CONF */
 
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif /* NETSTACK_CONF_MAC */
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif /* NETSTACK_CONF_RDC */
-
 #ifndef NETSTACK_CONF_RADIO
 #define NETSTACK_CONF_RADIO   micromac_radio_driver
 #endif /* NETSTACK_CONF_RADIO */
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #define PACKETBUF_CONF_ATTRS_INLINE 1
 
 #ifndef IEEE802154_CONF_PANID

drivers/platform/native/contiki-conf.h

@@ -82,18 +82,10 @@ typedef unsigned short uip_stats_t;
 #define NETSTACK_CONF_MAC     nullmac_driver
 #endif /* NETSTACK_CONF_MAC */
 
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif /* NETSTACK_CONF_RDC */
-
 #ifndef NETSTACK_CONF_RADIO
 #define NETSTACK_CONF_RADIO   nullradio_driver
 #endif /* NETSTACK_CONF_RADIO */
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #define NETSTACK_CONF_NETWORK sicslowpan_driver
 
 #define NETSTACK_CONF_LINUXRADIO_DEV "wpan0"

drivers/platform/openmote-cc2538/contiki-conf.h

@@ -303,30 +303,15 @@ typedef uint32_t rtimer_clock_t;
 #include "board.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name Network Stack Configuration
+ * \name Radio Configuration
  *
  * @{
  */
-#ifndef NETSTACK_CONF_NETWORK
-#define NETSTACK_CONF_NETWORK sicslowpan_driver
-#endif /* NETSTACK_CONF_NETWORK */
-
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif
 
 /* Configure NullRDC for when it's selected */
 #define NULLRDC_802154_AUTOACK                  1
 #define NULLRDC_802154_AUTOACK_HW               1
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #ifndef NETSTACK_CONF_RADIO
 #define NETSTACK_CONF_RADIO         cc2538_rf_driver
 #endif

drivers/platform/sky/contiki-conf.h

@@ -9,22 +9,10 @@
 #include "platform-conf.h"
 #endif /* PLATFORM_CONF_H */
 
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif /* NETSTACK_CONF_MAC */
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif /* NETSTACK_CONF_RDC */
-
 #ifndef NETSTACK_CONF_RADIO
 #define NETSTACK_CONF_RADIO   cc2420_driver
 #endif /* NETSTACK_CONF_RADIO */
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #ifndef CC2420_CONF_AUTOACK
 #define CC2420_CONF_AUTOACK              1
 #endif /* CC2420_CONF_AUTOACK */

drivers/platform/srf06-cc26xx/contiki-conf.h

@@ -53,14 +53,6 @@
 #define NETSTACK_CONF_NETWORK sicslowpan_driver
 #endif /* NETSTACK_CONF_NETWORK */
 
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif
-
 /*
  * If set, the systems keeps the HF crystal oscillator on even when the radio is off.
  * You need to set this to 1 to use TSCH with its default 2.2ms or larger guard time.
@@ -72,10 +64,6 @@
 /* Configure NullRDC for when it's selected */
 #define NULLRDC_CONF_802154_AUTOACK             1
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif
-
 #ifdef RF_CHANNEL
 #define RF_CORE_CONF_CHANNEL             RF_CHANNEL
 #endif

drivers/platform/wismote/contiki-conf.h

@@ -5,22 +5,10 @@
 
 #include "platform-conf.h"
 
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif /* NETSTACK_CONF_MAC */
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif /* NETSTACK_CONF_RDC */
-
 #ifndef NETSTACK_CONF_RADIO
 #define NETSTACK_CONF_RADIO   cc2520_driver
 #endif /* NETSTACK_CONF_RADIO */
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #ifndef CC2520_CONF_AUTOACK
 #define CC2520_CONF_AUTOACK              1
 #endif /* CC2520_CONF_AUTOACK */

drivers/platform/z1/contiki-conf.h

@@ -39,23 +39,6 @@
 
 #if NETSTACK_CONF_WITH_IPV6
 
-/* Network setup for IPv6 */
-#ifndef NETSTACK_CONF_NETWORK
-#define NETSTACK_CONF_NETWORK       sicslowpan_driver
-#endif
-
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC           csma_driver
-#endif
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC           nullrdc_driver
-#endif
-
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER        framer_802154
-#endif
-
 #define NETSTACK_CONF_RADIO         cc2420_driver
 
 /* Specify a minimum packet size for 6lowpan compression to be

drivers/platform/zoul/contiki-conf.h

@@ -301,30 +301,14 @@ typedef uint32_t rtimer_clock_t;
 #include "board.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name Network Stack Configuration
+ * \name Radio Configuration
  *
  * @{
  */
-#ifndef NETSTACK_CONF_NETWORK
-#define NETSTACK_CONF_NETWORK sicslowpan_driver
-#endif /* NETSTACK_CONF_NETWORK */
-
-#ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     csma_driver
-#endif
-
-#ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#endif
-
 /* Configure NullRDC for when it's selected */
 #define NULLRDC_CONF_802154_AUTOACK             1
 #define NULLRDC_CONF_802154_AUTOACK_HW			    1
 
-#ifndef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-#endif /* NETSTACK_CONF_FRAMER */
-
 #if CC1200_CONF_SUBGHZ_50KBPS_MODE
 #define NETSTACK_CONF_RADIO                                 cc1200_driver
 #define CC1200_CONF_RF_CFG                                  cc1200_802154g_863_870_fsk_50kbps

examples/ipv6/rpl-tsch/project-conf.h

@@ -65,8 +65,6 @@
 #define NETSTACK_CONF_MAC     tschmac_driver
 #undef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC     nordc_driver
-#undef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
 
 /* IEEE802.15.4 frame version */
 #undef FRAME802154_CONF_VERSION

examples/platform-specific/jn516x/dr1175-sensors/Makefile

@@ -1,6 +1,5 @@
 CONTIKI=../../../..
 CONTIKI_PROJECT = node
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 TARGET ?= jn516x
 JN516x_WITH_DR1175 = 1

examples/platform-specific/jn516x/dr1175-sensors/project-conf.h

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2015, SICS Swedish ICT.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-/**
- * \author Atis Elsts <atis.elsts@sics.se>
- */
-
-#ifndef __PROJECT_CONF_H__
-#define __PROJECT_CONF_H__
-
-#undef   NETSTACK_CONF_RDC
-#undef   NETSTACK_CONF_FRAMER
-#undef   NETSTACK_CONF_MAC
-#undef   NETSTACK_CONF_NETWORK
-
-#define  NETSTACK_CONF_RDC     nullrdc_driver
-#define  NETSTACK_CONF_FRAMER  framer_802154
-#define  NETSTACK_CONF_MAC     csma_driver
-#define  NETSTACK_CONF_NETWORK sicslowpan_driver
-
-#endif /* __PROJECT_CONF_H__ */

examples/platform-specific/jn516x/rpl/common-conf.h

@@ -45,10 +45,6 @@
 
 #if MAC_CONFIG == MAC_CONFIG_NULLRDC
 
-#define NETSTACK_CONF_MAC     csma_driver
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#define NETSTACK_CONF_FRAMER  framer_802154
-
 #elif MAC_CONFIG == MAC_CONFIG_TSCH
 
 /* Set to run orchestra */
@@ -63,7 +59,6 @@
 
 #define NETSTACK_CONF_MAC     tschmac_driver
 #define NETSTACK_CONF_RDC     nordc_driver
-#define NETSTACK_CONF_FRAMER  framer_802154
 
 /* IEEE802.15.4 frame version */
 #undef FRAME802154_CONF_VERSION

regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h

@@ -50,9 +50,6 @@
 #undef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC        nordc_driver
 
-#undef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER     framer_802154
-
 #undef FRAME802154_CONF_VERSION
 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012
 

regression-tests/13-ieee802154/code/project-tsch-conf.h

@@ -39,9 +39,6 @@
 #define NETSTACK_CONF_MAC     tschmac_driver
 #undef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC     nordc_driver
-#undef NETSTACK_CONF_FRAMER
-#define NETSTACK_CONF_FRAMER  framer_802154
-
 
 #if WITH_SECURITY_ON
 #define TEST_CONFIG_TYPE SECURITY_ON