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

removed comm stack specifics from template

Browse source
This commit is contained in:
fros4943 2007-05-18 13:51:42 +00:00
parent 8ef1b90a10
commit 1648d10e91
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/cooja/config/contiki_template.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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/simEnvChange.h"
#include "lib/sensors.h" #include "lib/sensors.h"
#include "net/rime.h"
#include "net/uip.h"
#include "dev/radio-arch.h"
#include "cfs/cfs-cooja.h" #include "cfs/cfs-cooja.h"
#include "sys/etimer.h" #include "sys/etimer.h"
#include "sys/cooja_mt.h" #include "sys/cooja_mt.h"
#include "net/init-net.h"
/* Declare all initialization processes */ /* Declare all initialization processes */
[PROCESS_DEFINITIONS] [PROCESS_DEFINITIONS]
@ -94,10 +92,6 @@
/* Create simulation interfaces array */ /* Create simulation interfaces array */
[INTERFACE_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. * referenceVar is used for comparing absolute and process relative memory.
* (this must not be static due to memory locations) * (this must not be static due to memory locations)
@ -160,15 +154,8 @@ Java_se_sics_cooja_corecomm_[CLASS_NAME]_init(JNIEnv *env, jobject obj)
/* Start Contiki processes */ /* Start Contiki processes */
procinit_init(); procinit_init();
/* Initialize Rime. */ /* Initialize communication stack */
rime_init(); init_net();
/* Initialize uIP */
uip_init();
uip_fw_init();
/* Register network interface */
uip_fw_default(&simNetworkIF);
/* Start user applications */ /* Start user applications */
autostart_start((struct process **) autostart_processes); autostart_start((struct process **) autostart_processes);