From 34280338aced9b141d90e90b2f991d66d3c11d39 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 1 Sep 2015 10:02:35 +0200 Subject: [PATCH 1/3] Z1: init random seed --- platform/z1/contiki-z1-main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index 78e1f4669..bab055d08 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -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); From db1635cf3c75dd8457992cf3fc6bef2c522da917 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 1 Sep 2015 10:03:44 +0200 Subject: [PATCH 2/3] Z1: configure SFD timestamp with flag CC2420_CONF_TIMESTAMP, for consistency the Sky platform and with cc2420.c --- platform/z1/dev/cc2420-arch.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c index bc345e29f..929a1e0e6 100644 --- a/platform/z1/dev/cc2420-arch.c +++ b/platform/z1/dev/cc2420-arch.c @@ -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. */ } From 4904386f4138a7cf4ec1c74dfe1ff7018b992d57 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 1 Sep 2015 10:04:19 +0200 Subject: [PATCH 3/3] Wismote: init random seed --- platform/wismote/contiki-wismote-main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c index f8b33d94a..f2da75a6c 100644 --- a/platform/wismote/contiki-wismote-main.c +++ b/platform/wismote/contiki-wismote-main.c @@ -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(); {