From 3d284f8ecd5583889c6fd2682c682b57249d2a7c Mon Sep 17 00:00:00 2001 From: Nicolas Tsiftes Date: Mon, 25 May 2015 16:52:12 +0200 Subject: [PATCH 1/2] Use the new path to a header file. --- platform/wismote/contiki-wismote-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c index 5e74a22ee..8322e749d 100644 --- a/platform/wismote/contiki-wismote-main.c +++ b/platform/wismote/contiki-wismote-main.c @@ -73,7 +73,7 @@ extern const struct uip_router UIP_ROUTER_MODULE; #if NETSTACK_CONF_WITH_IPV4 #include "net/ip/uip.h" #include "net/ipv4/uip-fw.h" -#include "net/uip-fw-drv.h" +#include "net/ipv4/uip-fw-drv.h" #include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; From a14c78e1ceeb96d273673d2821b5e3c5d94d9d23 Mon Sep 17 00:00:00 2001 From: Nicolas Tsiftes Date: Mon, 25 May 2015 17:04:39 +0200 Subject: [PATCH 2/2] Build the Wismote platform with ContikiMAC and CSMA enabled by default. --- platform/wismote/contiki-conf.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/wismote/contiki-conf.h b/platform/wismote/contiki-conf.h index 761d68f91..03cfcff40 100644 --- a/platform/wismote/contiki-conf.h +++ b/platform/wismote/contiki-conf.h @@ -6,13 +6,11 @@ #include "platform-conf.h" #ifndef NETSTACK_CONF_MAC -/* #define NETSTACK_CONF_MAC csma_driver */ -#define NETSTACK_CONF_MAC nullmac_driver +#define NETSTACK_CONF_MAC csma_driver #endif /* NETSTACK_CONF_MAC */ #ifndef NETSTACK_CONF_RDC -/* #define NETSTACK_CONF_RDC contikimac_driver */ -#define NETSTACK_CONF_RDC nullrdc_driver +#define NETSTACK_CONF_RDC contikimac_driver #endif /* NETSTACK_CONF_RDC */ #ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE