From d8f6f03edcca52e2ba70a8b4cfe9871ada694160 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Thu, 20 Dec 2007 13:43:24 +0000
Subject: [PATCH] moving radio init to init-net files

---
 platform/msb430/contiki-msb430-main.c | 2 --
 platform/msb430/init-net-rime.c       | 4 +++-
 platform/msb430/init-net-uip.c        | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/msb430/contiki-msb430-main.c b/platform/msb430/contiki-msb430-main.c
index 514880e8b..5d6dd6915 100644
--- a/platform/msb430/contiki-msb430-main.c
+++ b/platform/msb430/contiki-msb430-main.c
@@ -98,8 +98,6 @@ main(void)
   /* System services */
   process_start(&etimer_process, NULL);
 
-  cc1020_init(cc1020_config_19200);
-
   node_id_restore();
 
   init_net();
diff --git a/platform/msb430/init-net-rime.c b/platform/msb430/init-net-rime.c
index 19d687fa2..a69501812 100644
--- a/platform/msb430/init-net-rime.c
+++ b/platform/msb430/init-net-rime.c
@@ -42,12 +42,14 @@
 #include "dev/cc1020.h"
 #include "net/mac/nullmac.h"
 #include "net/rime.h"
+#include "contiki-msb430.h"
 
 void
 init_net(void)
 {
   rimeaddr_t rimeaddr;
-
+  
+  cc1020_init(cc1020_config_19200);
   rime_init(nullmac_init(&cc1020_driver));
   rimeaddr.u16[0] = node_id;
   rimeaddr_set_node_addr(&rimeaddr);
diff --git a/platform/msb430/init-net-uip.c b/platform/msb430/init-net-uip.c
index a52d24e87..672b13d7d 100644
--- a/platform/msb430/init-net-uip.c
+++ b/platform/msb430/init-net-uip.c
@@ -42,6 +42,7 @@
 #include "node-id.h"
 #include "dev/slip.h"
 #include "dev/cc1020-uip.h"
+#include "contiki-msb430.h"
 
 static struct uip_fw_netif slipif =
 {UIP_FW_NETIF(172,16,0,0, 255,255,255,0, slip_send)};
@@ -53,6 +54,7 @@ void
 init_net(void)
 {
   uip_ipaddr_t hostaddr;
+  cc1020_init(cc1020_config_19200);
 
   uip_init();
   uip_fw_init();