natas_hw
/
mspsim
mirror of https://github.com/contiki-ng/mspsim
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added methods to load a firmware without specifying a memory.

This commit is contained in:
Niclas Finne 2012-05-31 10:48:59 +02:00
parent e2e1fba86d
commit df95ab477f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
se/sics/mspsim/platform/GenericNode.java
View File

@ -295,7 +295,11 @@ public abstract class GenericNode extends Chip implements Runnable {
}
}
public ELF loadFirmware(URL url, int[] memory) throws IOException {
public ELF loadFirmware(URL url) throws IOException {
return loadFirmware(url, cpu.memory);
}
@Deprecated public ELF loadFirmware(URL url, int[] memory) throws IOException {
DataInputStream inputStream = new DataInputStream(url.openStream());
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
byte[] firmwareData = new byte[2048];
@ -309,11 +313,19 @@ public abstract class GenericNode extends Chip implements Runnable {
return loadFirmware(elf, memory);
}
public ELF loadFirmware(String name, int[] memory) throws IOException {
public ELF loadFirmware(String name) throws IOException {
return loadFirmware(name, cpu.memory);
}
@Deprecated public ELF loadFirmware(String name, int[] memory) throws IOException {
return loadFirmware(ELF.readELF(firmwareFile = name), memory);
}
public ELF loadFirmware(ELF elf, int[] memory) {
public ELF loadFirmware(ELF elf) {
return loadFirmware(elf, cpu.memory);
}
@Deprecated public ELF loadFirmware(ELF elf, int[] memory) {
if (cpu.isRunning()) {
stop();
}