deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

keep in synch with the Rime abstraction

Browse source
This commit is contained in:
zhitao 2007-10-25 08:26:49 +00:00
parent e7dc3ec422
commit ff006a5103
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/netsim/Makefile.netsim
View file

@ -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 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 \ 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 \ 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 \ dlloader.c main.c netsim-init.c contiki-main.c symtab.c symbols.c tr1001.c tr1001-drv.c
ethernode-rime.c
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
CONTIKI_TARGET_SOURCEFILES = $(NETSIM) $(SENSORS) wpcap-drv.c wpcap.c CONTIKI_TARGET_SOURCEFILES = $(NETSIM) $(SENSORS) wpcap-drv.c wpcap.c

7
platform/netsim/contiki-main.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * 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" #include "contiki.h"
@ -96,7 +96,8 @@ contiki_main(int flag)
uip_init(); uip_init();
rime_init(); rime_init(nullmac_init(&ethernode_driver));
uip_over_mesh_init(0); uip_over_mesh_init(0);
if(flag == 1) { if(flag == 1) {
@ -116,8 +117,6 @@ contiki_main(int flag)
rtimer_init(); rtimer_init();
ethernode_rime_init();
autostart_start(autostart_processes); autostart_start(autostart_processes);
while(1) { while(1) {