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

Merge pull request #1598 from mguc/jn516x_llsecinit_ccm-star

Browse source 
JN516x NETSTACK_LLSEC.init and ccm-star fix
This commit is contained in:
Simon Duquennoy 2016-04-19 17:27:15 +02:00
parent ba72f0a131 d8db093eb2
commit de51dd5c30
3 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/jn516x/Makefile.jn516x
View file

@ -80,7 +80,7 @@ SIZE:=$(CROSS_COMPILE)-size
OBJCOPY:=$(CROSS_COMPILE)-objcopy OBJCOPY:=$(CROSS_COMPILE)-objcopy
OBJDUMP:=$(CROSS_COMPILE)-objdump OBJDUMP:=$(CROSS_COMPILE)-objdump
ARCH = ccm-star.c exceptions.c rtimer-arch.c rtimer-arch-slow.c \ ARCH = jn516x-ccm-star.c exceptions.c rtimer-arch.c rtimer-arch-slow.c \
slip_uart0.c clock.c micromac-radio.c \ slip_uart0.c clock.c micromac-radio.c \
mtarch.c node-id.c watchdog.c log.c slip.c sprintf.c mtarch.c node-id.c watchdog.c log.c slip.c sprintf.c
# Default uart0 for printf and slip # Default uart0 for printf and slip

1
platform/jn516x/contiki-jn516x-main.c
View file

@ -409,7 +409,6 @@ main(void)
#endif /* NETSTACK_CONF_WITH_IPV4 */ #endif /* NETSTACK_CONF_WITH_IPV4 */
watchdog_start(); watchdog_start();
NETSTACK_LLSEC.init();
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
start_uip6(); start_uip6();

0
platform/jn516x/dev/ccm-star.c → platform/jn516x/dev/jn516x-ccm-star.c
View file