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

cleaned up main

Browse source
This commit is contained in:
Enric M. Calvo 2011-03-26 10:15:49 +01:00
parent aba380b960
commit 4ba4d55e34
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
.a *.a
*.bin *.bin
*.map *.map
*.png *.png

6
platform/z1/contiki-z1-main.c
View file

@ -32,7 +32,7 @@
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h> //Enric_Joakim #include <stdarg.h>
#include <io.h> #include <io.h>
@ -246,7 +246,6 @@ main(int argc, char **argv)
} }
#endif #endif
//Enric random_init(node_mac[0] + node_id);
/* /*
* Initialize Contiki and our processes. * Initialize Contiki and our processes.
@ -256,7 +255,7 @@ main(int argc, char **argv)
ctimer_init(); ctimer_init();
init_platform(); //Enric_Z1SP process_start(&sensors_process, NULL); init_platform();
set_rime_addr(); set_rime_addr();
@ -291,7 +290,6 @@ main(int argc, char **argv)
#if WITH_UIP6 #if WITH_UIP6
PRINTF("in WITH_UIP6\n"); //Enric
memcpy(&uip_lladdr.addr, node_mac, sizeof(uip_lladdr.addr)); memcpy(&uip_lladdr.addr, node_mac, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */ /* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */ /* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */