Niclas Finne | 7 Jun 2012 10:54
Picon

[d1bef2b] contiki-z1-main.c: Bug fix: setup MAC address based on node id if no MAC add...

Summary of changes:
 platform/z1/contiki-z1-main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit d1bef2b68afb24dfc73370b2c40aeffffebbf879
Author: Niclas Finne <nfi@...>
Date:   Thu Jun 7 10:45:05 2012 +0200

    Bug fix: setup MAC address based on node id if no MAC address was restored from external flash

diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c
index 3b61954..e97fddf 100644
--- a/platform/z1/contiki-z1-main.c
+++ b/platform/z1/contiki-z1-main.c
 <at>  <at>  -220,8 +220,8  <at>  <at>  main(int argc, char **argv)
   node_id_restore();

   /* If no MAC address was burned, we use the node ID. */
-  if(node_mac[0] | node_mac[1] | node_mac[2] | node_mac[3] |
-     node_mac[4] | node_mac[5] | node_mac[6] | node_mac[7]) {
+  if(!(node_mac[0] | node_mac[1] | node_mac[2] | node_mac[3] |
+       node_mac[4] | node_mac[5] | node_mac[6] | node_mac[7])) {
     node_mac[0] = 0xc1;  /* Hardcoded for Z1 */
     node_mac[1] = 0x0c;  /* Hardcoded for Revision C */
     node_mac[2] = 0x00;  /* Hardcoded to arbitrary even number so that
-----------------------------------------------------------------------

--

-- 
contiki
(Continue reading)


Gmane