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

Merge pull request #1226 from simonduq/z1-wismote-minor

Browse source 
Minor fixes to Z1 and Wismote
This commit is contained in:
Antonio Lignan 2015-09-01 14:15:20 +02:00
parent 650de13ad8 4904386f41
commit c792993664
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/wismote/contiki-wismote-main.c
View file

@ -257,6 +257,7 @@ main(int argc, char **argv)
init_platform(); init_platform();
set_rime_addr(); set_rime_addr();
random_init(linkaddr_node_addr.u8[6] + linkaddr_node_addr.u8[7]);
cc2520_init(); cc2520_init();
{ {

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

@ -268,6 +268,7 @@ main(int argc, char **argv)
/* /*
* Initialize Contiki and our processes. * Initialize Contiki and our processes.
*/ */
random_init(node_mac[6] + node_mac[7]);
process_init(); process_init();
process_start(&etimer_process, NULL); process_start(&etimer_process, NULL);

8
platform/z1/dev/cc2420-arch.c
View file

@ -34,13 +34,17 @@
#include "cc2420.h" #include "cc2420.h"
#include "isr_compat.h" #include "isr_compat.h"
#ifdef CC2420_CONF_SFD_TIMESTAMPS
#define CONF_SFD_TIMESTAMPS CC2420_CONF_SFD_TIMESTAMPS
#endif /* CC2420_CONF_SFD_TIMESTAMPS */
#ifndef CONF_SFD_TIMESTAMPS #ifndef CONF_SFD_TIMESTAMPS
#define CONF_SFD_TIMESTAMPS 0 #define CONF_SFD_TIMESTAMPS 0
#endif /* CONF_SFD_TIMESTAMPS */ #endif /* CONF_SFD_TIMESTAMPS */
#ifdef CONF_SFD_TIMESTAMPS #ifdef CONF_SFD_TIMESTAMPS
#include "cc2420-arch-sfd.h" #include "cc2420-arch-sfd.h"
#endif #endif /* CONF_SFD_TIMESTAMPS */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if 0 #if 0
@ -67,7 +71,7 @@ cc2420_arch_init(void)
#if CONF_SFD_TIMESTAMPS #if CONF_SFD_TIMESTAMPS
cc2420_arch_sfd_init(); cc2420_arch_sfd_init();
#endif #endif /* CONF_SFD_TIMESTAMPS */
CC2420_SPI_DISABLE(); /* Unselect radio. */ CC2420_SPI_DISABLE(); /* Unselect radio. */
} }