From d74fd06536c5e24ca599d9d204603f172521b70a Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sun, 17 Feb 2008 14:12:52 +0000 Subject: [PATCH] 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. --- platform/c128/contiki-main.c | 14 +++++++------- platform/c64/contiki-main.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/platform/c128/contiki-main.c b/platform/c128/contiki-main.c index cf51e71fc..2eeada560 100644 --- a/platform/c128/contiki-main.c +++ b/platform/c128/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $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 @@ -83,10 +83,6 @@ main(void) process_init(); - procinit_init(); - - autostart_start(autostart_processes); - #if 1 ethernet_config = config_read("contiki.cfg"); @@ -112,8 +108,6 @@ main(void) } #endif - process_start((struct process *)ðernet_process, (char *)ethernet_config); - #if (WITH_GUI && WITH_MOUSE) { static const u8_t mouse_sprite[64] = { @@ -132,6 +126,12 @@ main(void) } #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 ...", ""); while(1) { diff --git a/platform/c64/contiki-main.c b/platform/c64/contiki-main.c index 945966b7a..e617be077 100644 --- a/platform/c64/contiki-main.c +++ b/platform/c64/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $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 @@ -83,10 +83,6 @@ main(void) process_init(); - procinit_init(); - - autostart_start(autostart_processes); - #if 1 ethernet_config = config_read("contiki.cfg"); @@ -112,8 +108,6 @@ main(void) } #endif - process_start((struct process *)ðernet_process, (char *)ethernet_config); - #if (WITH_GUI && WITH_MOUSE) { static const u8_t mouse_sprite[64] = { @@ -132,6 +126,12 @@ main(void) } #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 ...", ""); while(1) {