mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-23 01:29:33 +00:00
Merge pull request #1226 from simonduq/z1-wismote-minor
Minor fixes to Z1 and Wismote
This commit is contained in:
commit
c792993664
@ -257,6 +257,7 @@ main(int argc, char **argv)
|
||||
init_platform();
|
||||
|
||||
set_rime_addr();
|
||||
random_init(linkaddr_node_addr.u8[6] + linkaddr_node_addr.u8[7]);
|
||||
|
||||
cc2520_init();
|
||||
{
|
||||
|
@ -268,6 +268,7 @@ main(int argc, char **argv)
|
||||
/*
|
||||
* Initialize Contiki and our processes.
|
||||
*/
|
||||
random_init(node_mac[6] + node_mac[7]);
|
||||
process_init();
|
||||
process_start(&etimer_process, NULL);
|
||||
|
||||
|
@ -34,13 +34,17 @@
|
||||
#include "cc2420.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
|
||||
#define CONF_SFD_TIMESTAMPS 0
|
||||
#endif /* CONF_SFD_TIMESTAMPS */
|
||||
|
||||
#ifdef CONF_SFD_TIMESTAMPS
|
||||
#include "cc2420-arch-sfd.h"
|
||||
#endif
|
||||
#endif /* CONF_SFD_TIMESTAMPS */
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if 0
|
||||
@ -67,7 +71,7 @@ cc2420_arch_init(void)
|
||||
|
||||
#if CONF_SFD_TIMESTAMPS
|
||||
cc2420_arch_sfd_init();
|
||||
#endif
|
||||
#endif /* CONF_SFD_TIMESTAMPS */
|
||||
|
||||
CC2420_SPI_DISABLE(); /* Unselect radio. */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user