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

fixed bug in IOPort config

This commit is contained in:
Joakim Eriksson 2011-09-11 17:49:01 +02:00
parent 99f65e0ece
commit d382fbf660
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
se/sics/mspsim/config/MSP430f1611Config.java
View File

@ -109,13 +109,15 @@ public class MSP430f1611Config extends MSP430Config {
ioUnits.add(dma);
// Add port 1,2 with interrupt capability!
ioUnits.add(new IOPort(cpu, 1, 4, cpu.memory, 0x20));
ioUnits.add(new IOPort(cpu, 2, 1, cpu.memory, 0x28));
IOPort io1;
IOPort io2;
ioUnits.add(io1 = new IOPort(cpu, 1, 4, cpu.memory, 0x20));
ioUnits.add(io2 = new IOPort(cpu, 2, 1, cpu.memory, 0x28));
for (int i = 0, n = 8; i < n; i++) {
cpu.memOut[0x20 + i] = ioUnits.get(0);
cpu.memOut[0x28 + i] = ioUnits.get(1);
cpu.memIn[0x20 + i] = ioUnits.get(0);
cpu.memIn[0x28 + i] = ioUnits.get(1);
cpu.memOut[0x20 + i] = io1;
cpu.memOut[0x28 + i] = io2;
cpu.memIn[0x20 + i] = io1;
cpu.memIn[0x28 + i] = io2;
}
// Add port 3,4 & 5,6

14
se/sics/mspsim/config/MSP430f2617Config.java
View File

@ -110,13 +110,15 @@ public class MSP430f2617Config extends MSP430Config {
cpu.memIn[7] = usciA1;
// Add port 1,2 with interrupt capability!
ioUnits.add(new IOPort(cpu, 1, 4, cpu.memory, 0x20));
ioUnits.add(new IOPort(cpu, 2, 1, cpu.memory, 0x28));
IOPort io1;
IOPort io2;
ioUnits.add(io1 = new IOPort(cpu, 1, 4, cpu.memory, 0x20));
ioUnits.add(io2 = new IOPort(cpu, 2, 1, cpu.memory, 0x28));
for (int i = 0, n = 8; i < n; i++) {
cpu.memOut[0x20 + i] = ioUnits.get(0);
cpu.memOut[0x28 + i] = ioUnits.get(1);
cpu.memIn[0x20 + i] = ioUnits.get(0);
cpu.memIn[0x28 + i] = ioUnits.get(1);
cpu.memOut[0x20 + i] = io1;
cpu.memOut[0x28 + i] = io2;
cpu.memIn[0x20 + i] = io1;
cpu.memIn[0x28 + i] = io2;
}
// Add port 3,4 & 5,6