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

Merge pull request #566 from ejoerns/pull-req/addr-fix

Browse source 
[Cooja] rename rimeaddr_node_addr to linkaddr_node_addr in RimeAddress interface
This commit is contained in:
Fredrik Österlind 2014-02-21 12:09:21 +01:00
parent a1cd642e6e 90ab2e7051
commit e1e1f1c326
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/cooja/java/org/contikios/cooja/interfaces/RimeAddress.java
View file

@ -48,7 +48,7 @@ import org.contikios.cooja.MoteMemory.MemoryEventType;
import org.contikios.cooja.MoteMemory.MemoryMonitor; 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. * XXX Assuming Rime address is 2 bytes.
* *
* @see #RIME_ADDR_LENGTH * @see #RIME_ADDR_LENGTH
@ -76,12 +76,12 @@ public class RimeAddress extends MoteInterface {
} }
}; };
/* TODO XXX Timeout? */ /* 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() { public boolean hasRimeAddress() {
return moteMem.variableExists("rimeaddr_node_addr"); return moteMem.variableExists("linkaddr_node_addr");
} }
public String getAddressString() { public String getAddressString() {
@ -90,7 +90,7 @@ public class RimeAddress extends MoteInterface {
} }
String addrString = ""; 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++) { for (int i=0; i < RIME_ADDR_LENGTH-1; i++) {
addrString += (0xFF & addr[i]) + "."; addrString += (0xFF & addr[i]) + ".";
} }
@ -131,7 +131,7 @@ public class RimeAddress extends MoteInterface {
public void removed() { public void removed() {
super.removed(); super.removed();
if (memMonitor != null) { 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);
} }
} }