From 20a5c794dd1c83151a9087903b88550b7f1f7834 Mon Sep 17 00:00:00 2001 From: David Kopf Date: Sat, 11 Feb 2012 15:19:28 -0500 Subject: [PATCH] Move address initialization to after proce_init. Something in that now wiping the address array. --- platform/minimal-net/contiki-main.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c index 9e28979f9..cf09c2718 100644 --- a/platform/minimal-net/contiki-main.c +++ b/platform/minimal-net/contiki-main.c @@ -29,7 +29,6 @@ * * This file is part of the Contiki OS * - * $Id: contiki-main.c,v 1.25 2010/10/19 18:29:05 adamdunkels Exp $ * */ @@ -222,6 +221,9 @@ main(void) printf("RPL enabled\n"); #endif + procinit_init(); + autostart_start(autostart_processes); + /* Set default IP addresses if not specified */ #if !UIP_CONF_IPV6 { @@ -274,7 +276,17 @@ main(void) } #endif /* !UIP_CONF_IPV6_RPL */ -#if !RPL_BORDER_ROUTER /* Border router process prints addresses later */ +#endif /* !UIP_CONF_IPV6 */ + + // procinit_init(); + // autostart_start(autostart_processes); + + /* Make standard output unbuffered. */ + setvbuf(stdout, (char *)NULL, _IONBF, 0); + + printf("\n*******%s online*******\n",CONTIKI_VERSION_STRING); + +#if UIP_CONF_IPV6 && !RPL_BORDER_ROUTER /* Border router process prints addresses later */ { uint8_t i; for(i = 0; i < UIP_DS6_ADDR_NB; i++) { @@ -285,16 +297,7 @@ main(void) } } } -#endif /* !RPL_BORDER_ROUTER */ -#endif /* !UIP_CONF_IPV6 */ - - procinit_init(); - autostart_start(autostart_processes); - - /* Make standard output unbuffered. */ - setvbuf(stdout, (char *)NULL, _IONBF, 0); - - printf("\n*******%s online*******\n",CONTIKI_VERSION_STRING); +#endif while(1) { fd_set fds;