From 90ab2e70514bc3e19ff22ab63ed8f5ad5c7da5dd Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Thu, 6 Feb 2014 03:52:48 +0100 Subject: [PATCH] cooja: interfaces/RimeAddress: renamed rimeaddr_node_addr to linkaddr_node_addr --- .../org/contikios/cooja/interfaces/RimeAddress.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/cooja/java/org/contikios/cooja/interfaces/RimeAddress.java b/tools/cooja/java/org/contikios/cooja/interfaces/RimeAddress.java index 50ccf72fc..405aca506 100644 --- a/tools/cooja/java/org/contikios/cooja/interfaces/RimeAddress.java +++ b/tools/cooja/java/org/contikios/cooja/interfaces/RimeAddress.java @@ -48,7 +48,7 @@ import org.contikios.cooja.MoteMemory.MemoryEventType; import org.contikios.cooja.MoteMemory.MemoryMonitor; /** - * Read-only interface to Rime address read from Contiki variable: rimeaddr_node_addr. + * Read-only interface to Rime address read from Contiki variable: linkaddr_node_addr. * XXX Assuming Rime address is 2 bytes. * * @see #RIME_ADDR_LENGTH @@ -76,12 +76,12 @@ public class RimeAddress extends MoteInterface { } }; /* TODO XXX Timeout? */ - moteMem.addMemoryMonitor(moteMem.getVariableAddress("rimeaddr_node_addr"), RIME_ADDR_LENGTH, memMonitor); + moteMem.addMemoryMonitor(moteMem.getVariableAddress("linkaddr_node_addr"), RIME_ADDR_LENGTH, memMonitor); } } public boolean hasRimeAddress() { - return moteMem.variableExists("rimeaddr_node_addr"); + return moteMem.variableExists("linkaddr_node_addr"); } public String getAddressString() { @@ -90,7 +90,7 @@ public class RimeAddress extends MoteInterface { } String addrString = ""; - byte[] addr = moteMem.getByteArray("rimeaddr_node_addr", RIME_ADDR_LENGTH); + byte[] addr = moteMem.getByteArray("linkaddr_node_addr", RIME_ADDR_LENGTH); for (int i=0; i < RIME_ADDR_LENGTH-1; i++) { addrString += (0xFF & addr[i]) + "."; } @@ -131,7 +131,7 @@ public class RimeAddress extends MoteInterface { public void removed() { super.removed(); if (memMonitor != null) { - moteMem.removeMemoryMonitor(moteMem.getVariableAddress("rimeaddr_node_addr"), RIME_ADDR_LENGTH, memMonitor); + moteMem.removeMemoryMonitor(moteMem.getVariableAddress("linkaddr_node_addr"), RIME_ADDR_LENGTH, memMonitor); } }