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

Updated to new MAC api

Browse source
This commit is contained in:
adamdunkels 2010-02-18 23:10:06 +00:00
parent a2664054c5
commit 927aa821c3
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/netsim/contiki-conf.h
View file

@ -1,6 +1,8 @@
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
#define __CONTIKI_CONF_H__ #define __CONTIKI_CONF_H__
#define NETSTACK_CONF_RADIO ethernode_driver
#define XMAC_CONF_ON_TIME RTIMER_SECOND #define XMAC_CONF_ON_TIME RTIMER_SECOND
#define XMAC_CONF_OFF_TIME RTIMER_SECOND * 2 #define XMAC_CONF_OFF_TIME RTIMER_SECOND * 2
@ -35,7 +37,7 @@
* *
* This file is part of the Contiki desktop OS * This file is part of the Contiki desktop OS
* *
* $Id: contiki-conf.h,v 1.12 2010/02/08 21:39:15 adamdunkels Exp $ * $Id: contiki-conf.h,v 1.13 2010/02/18 23:10:06 adamdunkels Exp $
* *
*/ */

10
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.33 2009/03/17 15:56:32 adamdunkels Exp $ * $Id: contiki-main.c,v 1.34 2010/02/18 23:10:06 adamdunkels Exp $
*/ */
#include "contiki.h" #include "contiki.h"
@ -126,10 +126,12 @@ contiki_main(int flag)
uip_init(); uip_init();
ctimer_init(); ctimer_init();
rime_init(nullmac_init(&ethernode_driver));
/* rime_init(lpp_init(&ethernode_driver));*/
uip_over_mesh_init(2); NETSTACK_RDC.init();
NETSTACK_MAC.init();
NETSTACK_NETWORK.init();
uip_over_mesh_init(2);
uip_over_mesh_set_net(&meshif.ipaddr, &meshif.netmask); uip_over_mesh_set_net(&meshif.ipaddr, &meshif.netmask);
if(flag == 1) { if(flag == 1) {