Now that process initialization has been changed (back) to synchronous it needs to be called after reading the config file and setting the mouse sprite in order to preserve the existing logic.
This commit is contained in:
parent
93789de9dd
commit
d74fd06536
|
@ -30,7 +30,7 @@
|
||||||
*
|
*
|
||||||
* Author: Oliver Schmidt <ol.sc@web.de>
|
* Author: Oliver Schmidt <ol.sc@web.de>
|
||||||
*
|
*
|
||||||
* $Id: contiki-main.c,v 1.2 2008/02/10 22:43:58 oliverschmidt Exp $
|
* $Id: contiki-main.c,v 1.3 2008/02/17 14:12:52 oliverschmidt Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -83,10 +83,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");
|
||||||
|
@ -112,8 +108,6 @@ main(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
process_start((struct process *)ðernet_process, (char *)ethernet_config);
|
|
||||||
|
|
||||||
#if (WITH_GUI && WITH_MOUSE)
|
#if (WITH_GUI && WITH_MOUSE)
|
||||||
{
|
{
|
||||||
static const u8_t mouse_sprite[64] = {
|
static const u8_t mouse_sprite[64] = {
|
||||||
|
@ -132,6 +126,12 @@ main(void)
|
||||||
}
|
}
|
||||||
#endif /* WITH_GUI && WITH_MOUSE */
|
#endif /* WITH_GUI && WITH_MOUSE */
|
||||||
|
|
||||||
|
procinit_init();
|
||||||
|
|
||||||
|
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) {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
*
|
*
|
||||||
* Author: Oliver Schmidt <ol.sc@web.de>
|
* Author: Oliver Schmidt <ol.sc@web.de>
|
||||||
*
|
*
|
||||||
* $Id: contiki-main.c,v 1.17 2008/02/10 22:43:07 oliverschmidt Exp $
|
* $Id: contiki-main.c,v 1.18 2008/02/17 14:13:07 oliverschmidt Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -83,10 +83,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");
|
||||||
|
@ -112,8 +108,6 @@ main(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
process_start((struct process *)ðernet_process, (char *)ethernet_config);
|
|
||||||
|
|
||||||
#if (WITH_GUI && WITH_MOUSE)
|
#if (WITH_GUI && WITH_MOUSE)
|
||||||
{
|
{
|
||||||
static const u8_t mouse_sprite[64] = {
|
static const u8_t mouse_sprite[64] = {
|
||||||
|
@ -132,6 +126,12 @@ main(void)
|
||||||
}
|
}
|
||||||
#endif /* WITH_GUI && WITH_MOUSE */
|
#endif /* WITH_GUI && WITH_MOUSE */
|
||||||
|
|
||||||
|
procinit_init();
|
||||||
|
|
||||||
|
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