From 1648d10e91fe925cc139bbd5f7cbd6c540f074b9 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Fri, 18 May 2007 13:51:42 +0000
Subject: [PATCH] removed comm stack specifics from template

---
 tools/cooja/config/contiki_template.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/tools/cooja/config/contiki_template.c b/tools/cooja/config/contiki_template.c
index 9a7c6261b..a99aa87b5 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.1 2007/03/22 16:20:22 fros4943 Exp $
+ * $Id: contiki_template.c,v 1.2 2007/05/18 13:51:42 fros4943 Exp $
  */
 
 /**
@@ -68,12 +68,10 @@
 
 #include "lib/simEnvChange.h"
 #include "lib/sensors.h"
-#include "net/rime.h"
-#include "net/uip.h"
-#include "dev/radio-arch.h"
 #include "cfs/cfs-cooja.h"
 #include "sys/etimer.h"
 #include "sys/cooja_mt.h"
+#include "net/init-net.h"
 
 /* Declare all initialization processes */
 [PROCESS_DEFINITIONS]
@@ -94,10 +92,6 @@
 /* Create simulation interfaces array */
 [INTERFACE_ARRAY]
 
-// Default network interface
-static struct uip_fw_netif simNetworkIF =
-  {UIP_FW_NETIF(0,0,0,0, 0,0,0,0, simDoSend)};
-
 /*
  * referenceVar is used for comparing absolute and process relative memory.
  * (this must not be static due to memory locations)
@@ -160,16 +154,9 @@ Java_se_sics_cooja_corecomm_[CLASS_NAME]_init(JNIEnv *env, jobject obj)
   /* Start Contiki processes */
   procinit_init();
 
-  /* Initialize Rime. */
-  rime_init();
-
-  /* Initialize uIP */
-  uip_init();
-  uip_fw_init();
-
-  /* Register network interface */
-  uip_fw_default(&simNetworkIF);
-
+  /* Initialize communication stack */
+  init_net();
+  
   /* Start user applications */
   autostart_start((struct process **) autostart_processes);