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

passive/active interfaces distinction removed.

Browse source
This commit is contained in:
fros4943 2008-10-28 12:05:30 +00:00
parent f35eeb575d
commit 31e2c88a66
2 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ContikiMote.java,v 1.7 2008/03/31 15:22:43 fros4943 Exp $ * $Id: ContikiMote.java,v 1.8 2008/10/28 12:05:30 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote; package se.sics.cooja.contikimote;
@ -261,20 +261,8 @@ public class ContikiMote implements Mote {
element.setText(getType().getIdentifier()); element.setText(getType().getIdentifier());
config.add(element); config.add(element);
// Active interface configs (if any) // Mote interfaces
for (MoteInterface moteInterface: getInterfaces().getAllActiveInterfaces()) { for (MoteInterface moteInterface: getInterfaces().getInterfaces()) {
element = new Element("interface_config");
element.setText(moteInterface.getClass().getName());
Collection interfaceXML = moteInterface.getConfigXML();
if (interfaceXML != null) {
element.addContent(interfaceXML);
config.add(element);
}
}
// Passive interface configs (if any)
for (MoteInterface moteInterface: getInterfaces().getAllPassiveInterfaces()) {
element = new Element("interface_config"); element = new Element("interface_config");
element.setText(moteInterface.getClass().getName()); element.setText(moteInterface.getClass().getName());

17
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ContikiMoteInterface.java,v 1.1 2006/08/21 12:13:09 fros4943 Exp $ * $Id: ContikiMoteInterface.java,v 1.2 2008/10/28 12:05:30 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote; package se.sics.cooja.contikimote;
@ -34,15 +34,14 @@ package se.sics.cooja.contikimote;
/** /**
* A Contiki mote interface has information about which, if any, core interfaces * A Contiki mote interface has information about which, if any, core interfaces
* it needs. * it needs.
* *
* All classes implementing this interface should also define a static method: * All classes implementing this interface must define the static method:
* public String[] getCoreInterfaceDependencies() { * public static String[] getCoreInterfaceDependencies();
* ... *
* }
*
* The method should return the names of all needed core interfaces. * The method should return the names of all needed core interfaces.
* *
* @author Fredrik Osterlind * @author Fredrik Österlind
*/ */
public interface ContikiMoteInterface { public interface ContikiMoteInterface {
/*public static String[] getCoreInterfaceDependencies();*/
} }