From f2ee2c706ce13e24925ae7844ffc2dd828855f67 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 15 Oct 2017 17:33:27 +0100 Subject: [PATCH] Call startup sequence stage 3 later --- os/contiki-main.c | 4 ++-- os/sys/platform.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os/contiki-main.c b/os/contiki-main.c index 2fa7494c0..b2d7b2291 100644 --- a/os/contiki-main.c +++ b/os/contiki-main.c @@ -88,8 +88,6 @@ main(void) netstack_init(); - platform_init_stage_three(); - #if NETSTACK_CONF_WITH_IPV6 memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr)); queuebuf_init(); @@ -104,6 +102,8 @@ main(void) serial_shell_init(); #endif /* BUILD_WITH_SHELL */ + platform_init_stage_three(); + autostart_start(autostart_processes); watchdog_start(); diff --git a/os/sys/platform.h b/os/sys/platform.h index d022ff905..cc26976e2 100644 --- a/os/sys/platform.h +++ b/os/sys/platform.h @@ -48,9 +48,9 @@ * - Initialises core Contiki-NG modules, such as the process scheduler and * timers * - Calls a platform-provided function to initialise more hardware drivers - * - Initialises the network stack + * - Initialises the network stack and TCP/IP * - Calls a platform-provided function to initialise any remaining drivers - * - Initialises TCP/IP and enters the main loop + * - Enters the main loop * * The main loop will service all pending events and will then call a * platform-dependent function to put the hardware in a low-power state.