From ff29ab2c94a9ae19414ea137c8fda6cc45330a6f Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Fri, 16 Jan 2015 22:22:16 +0100 Subject: [PATCH] bugfix define framer and llsec --- platform/osd-merkur/Makefile.osd-merkur | 2 +- platform/osd-merkur/contiki-conf.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/osd-merkur/Makefile.osd-merkur b/platform/osd-merkur/Makefile.osd-merkur index 65cbd80ba..f4d423fa8 100644 --- a/platform/osd-merkur/Makefile.osd-merkur +++ b/platform/osd-merkur/Makefile.osd-merkur @@ -68,7 +68,7 @@ include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/radio/Makefile.radio MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac \ -# core/net/llsec \ + core/net/llsec \ # core/net/ipv6 core/net/ipv4 core/net/ip \ # core/net/rime \ # core/net/rpl \ diff --git a/platform/osd-merkur/contiki-conf.h b/platform/osd-merkur/contiki-conf.h index c68cb27b1..5d8c88f8e 100644 --- a/platform/osd-merkur/contiki-conf.h +++ b/platform/osd-merkur/contiki-conf.h @@ -247,13 +247,11 @@ typedef unsigned short uip_stats_t; #define RIMESTATS_CONF_ENABLED 0 #if NETSTACK_CONF_WITH_IPV6 -//#define NETSTACK_CONF_FRAMER framer802154 +#define NETSTACK_CONF_FRAMER framer_802154 #else /* NETSTACK_CONF_WITH_IPV6 */ #define NETSTACK_CONF_FRAMER contikimac_framer #endif /* NETSTACK_CONF_WITH_IPV6 */ - -#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_RADIO rf230_driver /* The radio needs to interrupt during an rtimer interrupt */ #define RTIMER_CONF_NESTED_INTERRUPTS 1