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

Move address initialization to after proce_init. Something in that now wiping the address array.

Browse source
This commit is contained in:
David Kopf 2012-02-11 15:19:28 -05:00
parent 0327fe3020
commit 20a5c794dd
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
platform/minimal-net/contiki-main.c
View file

@ -29,7 +29,6 @@
* *
* This file is part of the Contiki OS * 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"); printf("RPL enabled\n");
#endif #endif
procinit_init();
autostart_start(autostart_processes);
/* Set default IP addresses if not specified */ /* Set default IP addresses if not specified */
#if !UIP_CONF_IPV6 #if !UIP_CONF_IPV6
{ {
@ -274,7 +276,17 @@ main(void)
} }
#endif /* !UIP_CONF_IPV6_RPL */ #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; uint8_t i;
for(i = 0; i < UIP_DS6_ADDR_NB; i++) { for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
@ -285,16 +297,7 @@ main(void)
} }
} }
} }
#endif /* !RPL_BORDER_ROUTER */ #endif
#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);
while(1) { while(1) {
fd_set fds; fd_set fds;