mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-22 10:30:13 +00:00
Merge pull request #1246 from nvt/wismote-fixes
Minor fixes for the WisMote platform
This commit is contained in:
commit
bebf0f9156
@ -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
|
||||
|
@ -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)};
|
||||
|
Loading…
Reference in New Issue
Block a user