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

removed abstract ip address interface: equal for all motes

Browse source
This commit is contained in:
fros4943 2009-04-20 16:12:37 +00:00
parent c76a406cba
commit 3718304c76
2 changed files with 7 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspIPAddress.java
View file

@ -1,48 +0,0 @@
/*
* Copyright (c) 2008, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: MspIPAddress.java,v 1.4 2009/04/01 17:43:18 fros4943 Exp $
*/
package se.sics.cooja.mspmote.interfaces;
import org.apache.log4j.Logger;
import se.sics.cooja.Mote;
import se.sics.cooja.interfaces.IPAddress;
public class MspIPAddress extends IPAddress {
private static Logger logger = Logger.getLogger(MspIPAddress.class);
public MspIPAddress(Mote mote) {
super(mote);
}
public double energyConsumption() {
return 0;
}
}

23
tools/cooja/java/se/sics/cooja/interfaces/IPAddress.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: IPAddress.java,v 1.3 2009/04/01 17:43:17 fros4943 Exp $
* $Id: IPAddress.java,v 1.4 2009/04/20 16:12:37 fros4943 Exp $
*/
package se.sics.cooja.interfaces;
@ -50,7 +50,7 @@ import se.sics.cooja.*;
* @author Fredrik Osterlind
*/
@ClassDescription("IP Address")
public abstract class IPAddress extends MoteInterface {
public class IPAddress extends MoteInterface {
private static Logger logger = Logger.getLogger(IPAddress.class);
private AddressMemory moteMem;
private static boolean warnedNotImplemented = false;
@ -231,23 +231,10 @@ public abstract class IPAddress extends MoteInterface {
public Collection<Element> getConfigXML() {
Vector<Element> config = new Vector<Element>();
Element element;
// Infinite boolean
element = new Element("ip");
element.setText(getIPString());
config.add(element);
return config;
return null;
}
public void setConfigXML(Collection<Element> configXML, boolean visAvailable) {
for (Element element : configXML) {
if (element.getName().equals("ip")) {
setIPString(element.getText());
}
}
}
private static String hex16ToString(int data) {
@ -258,4 +245,8 @@ public abstract class IPAddress extends MoteInterface {
}
return s;
}
public double energyConsumption() {
return 0;
}
}