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

Merge pull request #1246 from nvt/wismote-fixes

Browse source 
Minor fixes for the WisMote platform
This commit is contained in:
Nicolas Tsiftes 2015-09-08 13:52:45 +02:00
commit bebf0f9156
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/wismote/contiki-conf.h
View file

@ -6,13 +6,11 @@
#include "platform-conf.h" #include "platform-conf.h"
#ifndef NETSTACK_CONF_MAC #ifndef NETSTACK_CONF_MAC
/* #define NETSTACK_CONF_MAC csma_driver */ #define NETSTACK_CONF_MAC csma_driver
#define NETSTACK_CONF_MAC nullmac_driver
#endif /* NETSTACK_CONF_MAC */ #endif /* NETSTACK_CONF_MAC */
#ifndef NETSTACK_CONF_RDC #ifndef NETSTACK_CONF_RDC
/* #define NETSTACK_CONF_RDC contikimac_driver */ #define NETSTACK_CONF_RDC contikimac_driver
#define NETSTACK_CONF_RDC nullrdc_driver
#endif /* NETSTACK_CONF_RDC */ #endif /* NETSTACK_CONF_RDC */
#ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE

2
platform/wismote/contiki-wismote-main.c
View file

@ -73,7 +73,7 @@ extern const struct uip_router UIP_ROUTER_MODULE;
#if NETSTACK_CONF_WITH_IPV4 #if NETSTACK_CONF_WITH_IPV4
#include "net/ip/uip.h" #include "net/ip/uip.h"
#include "net/ipv4/uip-fw.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" #include "net/ipv4/uip-over-mesh.h"
static struct uip_fw_netif slipif = static struct uip_fw_netif slipif =
{UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)};