From 874ffb029be27051fe8586e397a691006d454490 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Tue, 10 Mar 2009 21:24:46 +0000
Subject: [PATCH] removed autostart processes from contiki template: these are
 now instead defined in the contiki application

---
 tools/cooja/config/contiki_template.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/cooja/config/contiki_template.c b/tools/cooja/config/contiki_template.c
index 9a7960f38..6b1206e2c 100644
--- a/tools/cooja/config/contiki_template.c
+++ b/tools/cooja/config/contiki_template.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: contiki_template.c,v 1.10 2009/01/21 12:18:10 fros4943 Exp $
+ * $Id: contiki_template.c,v 1.11 2009/03/10 21:24:46 fros4943 Exp $
  */
 
 /**
@@ -75,8 +75,7 @@
 
 #include "node-id.h"
 
-/* Declare all initialization processes */
-[PROCESS_DEFINITIONS]
+PROCINIT(&etimer_process);
 
 /* Declare all sensors */
 [SENSOR_DEFINITIONS]
@@ -85,9 +84,6 @@
 [INTERFACE_DEFINITIONS]
 
 
-/* Create initialization process array */
-[PROCESS_ARRAY]
-
 /* Create sensor array */
 [SENSOR_ARRAY]
 
@@ -130,6 +126,9 @@ start_process_run_loop(void *data)
     /* Start process handler */
     process_init();
 
+    /* Start Contiki processes */
+    procinit_init();
+
     /* Print startup information */
     printf(CONTIKI_VERSION_STRING " started. ");
     if(node_id > 0) {
@@ -137,8 +136,6 @@ start_process_run_loop(void *data)
     } else {
       printf("Node id is not set.\n");
     }
-    /* Start Contiki processes */
-    procinit_init();
 
     /* Initialize communication stack */
     init_net();
@@ -148,7 +145,7 @@ start_process_run_loop(void *data)
     }
     printf("%d\n", rimeaddr_node_addr.u8[i]);
 
-    /* Start user applications */
+    /* Start autostart processes (defined in Contiki application) */
     print_processes(autostart_processes);
     autostart_start(autostart_processes);