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

bugfix define framer and llsec

Browse source
This commit is contained in:
Harald Pichler 2015-01-16 22:22:16 +01:00
parent 64e3ed0281
commit ff29ab2c94
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/osd-merkur/Makefile.osd-merkur
View file

@ -68,7 +68,7 @@ include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio include $(CONTIKIAVR)/radio/Makefile.radio
MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac \ 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/ipv6 core/net/ipv4 core/net/ip \
# core/net/rime \ # core/net/rime \
# core/net/rpl \ # core/net/rpl \

4
platform/osd-merkur/contiki-conf.h
View file

@ -247,13 +247,11 @@ typedef unsigned short uip_stats_t;
#define RIMESTATS_CONF_ENABLED 0 #define RIMESTATS_CONF_ENABLED 0
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
//#define NETSTACK_CONF_FRAMER framer802154 #define NETSTACK_CONF_FRAMER framer_802154
#else /* NETSTACK_CONF_WITH_IPV6 */ #else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer #define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER framer_802154
#define NETSTACK_CONF_RADIO rf230_driver #define NETSTACK_CONF_RADIO rf230_driver
/* The radio needs to interrupt during an rtimer interrupt */ /* The radio needs to interrupt during an rtimer interrupt */
#define RTIMER_CONF_NESTED_INTERRUPTS 1 #define RTIMER_CONF_NESTED_INTERRUPTS 1