Now that process initialization has been changed (back) to synchronous it needs to be called after reading the config file in order to preserve the existing logic.
This commit is contained in:
parent
f74e918f00
commit
93789de9dd
|
@ -30,7 +30,7 @@
|
||||||
*
|
*
|
||||||
* Author: Oliver Schmidt <ol.sc@web.de>
|
* Author: Oliver Schmidt <ol.sc@web.de>
|
||||||
*
|
*
|
||||||
* $Id: contiki-main.c,v 1.15 2008/02/10 22:45:26 oliverschmidt Exp $
|
* $Id: contiki-main.c,v 1.16 2008/02/17 14:11:48 oliverschmidt Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "contiki-net.h"
|
#include "contiki-net.h"
|
||||||
|
@ -66,10 +66,6 @@ main(void)
|
||||||
|
|
||||||
process_init();
|
process_init();
|
||||||
|
|
||||||
procinit_init();
|
|
||||||
|
|
||||||
autostart_start(autostart_processes);
|
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
|
|
||||||
ethernet_config = config_read("contiki.cfg");
|
ethernet_config = config_read("contiki.cfg");
|
||||||
|
@ -95,8 +91,12 @@ main(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
procinit_init();
|
||||||
|
|
||||||
process_start((struct process *)ðernet_process, (char *)ethernet_config);
|
process_start((struct process *)ðernet_process, (char *)ethernet_config);
|
||||||
|
|
||||||
|
autostart_start(autostart_processes);
|
||||||
|
|
||||||
log_message("Contiki up and running ...", "");
|
log_message("Contiki up and running ...", "");
|
||||||
|
|
||||||
while(1) {
|
while(1) {
|
||||||
|
|
Loading…
Reference in a new issue