From ff006a5103f8402ca4701313de1770e8314f9950 Mon Sep 17 00:00:00 2001
From: zhitao <zhitao>
Date: Thu, 25 Oct 2007 08:26:49 +0000
Subject: [PATCH] keep in synch with the Rime abstraction

---
 platform/netsim/Makefile.netsim | 3 +--
 platform/netsim/contiki-main.c  | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/netsim/Makefile.netsim b/platform/netsim/Makefile.netsim
index 61c050dde..5f9594ac7 100644
--- a/platform/netsim/Makefile.netsim
+++ b/platform/netsim/Makefile.netsim
@@ -9,8 +9,7 @@ SENSORS = sensors.c beep.c button-sensor.c pir-sensor.c vib-sensor.c \
 	  dummy-sensors.c leds.c leds-arch.c esb-sensors.c
 NETSIM = cfs-ram.c ether.c ethernode.c ethernode-uip.c lpm.c rs232.c flash.c \
 	 node.c nodes.c sensor.c display.c random.c radio.c \
-	 dlloader.c main.c netsim-init.c contiki-main.c symtab.c symbols.c tr1001.c tr1001-drv.c \
-	 ethernode-rime.c
+	 dlloader.c main.c netsim-init.c contiki-main.c symtab.c symbols.c tr1001.c tr1001-drv.c 
 
 ifeq ($(OS),Windows_NT)
 CONTIKI_TARGET_SOURCEFILES = $(NETSIM) $(SENSORS) wpcap-drv.c wpcap.c
diff --git a/platform/netsim/contiki-main.c b/platform/netsim/contiki-main.c
index eda98a7e2..046862733 100644
--- a/platform/netsim/contiki-main.c
+++ b/platform/netsim/contiki-main.c
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-main.c,v 1.16 2007/05/22 21:08:57 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.17 2007/10/25 08:26:49 zhitao Exp $
  */
 
 #include "contiki.h"
@@ -96,7 +96,8 @@ contiki_main(int flag)
 
   uip_init();
   
-  rime_init();
+  rime_init(nullmac_init(&ethernode_driver));
+
   uip_over_mesh_init(0);
   
   if(flag == 1) {
@@ -116,8 +117,6 @@ contiki_main(int flag)
 
   rtimer_init();
   
-  ethernode_rime_init();
-
   autostart_start(autostart_processes);
   
   while(1) {