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

updated after API changes

This commit is contained in:
Joakim Eriksson 2011-09-09 00:15:46 +02:00
parent 130ca51cd9
commit 34395c4c2e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,8 +53,8 @@ public class MSP430f1611Config extends MSP430Config {
maxInterruptVector = 15;
/* configuration for the timers */
TimerConfig timerA = new TimerConfig(6, 5, 3, 0x160, Timer.TIMER_Ax149, "TimerA", Timer.TAIV);
TimerConfig timerB = new TimerConfig(13, 12, 7, 0x180, Timer.TIMER_Bx149, "TimerB", Timer.TBIV);
TimerConfig timerA = new TimerConfig(6, 5, 3, 0x160, Timer.TIMER_Ax149, "TimerA");
TimerConfig timerB = new TimerConfig(13, 12, 7, 0x180, Timer.TIMER_Bx149, "TimerB");
timerConfig = new TimerConfig[] {timerA, timerB};
/* configure memory */

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

@ -55,8 +55,8 @@ public class MSP430f2617Config extends MSP430Config {
MSP430XArch = true;
/* configuration for the timers */
TimerConfig timerA = new TimerConfig(25, 24, 3, 0x160, Timer.TIMER_Ax149, "TimerA", Timer.TAIV);
TimerConfig timerB = new TimerConfig(29, 28, 7, 0x180, Timer.TIMER_Bx149, "TimerB", Timer.TBIV);
TimerConfig timerA = new TimerConfig(25, 24, 3, 0x160, Timer.TIMER_Ax149, "TimerA");
TimerConfig timerB = new TimerConfig(29, 28, 7, 0x180, Timer.TIMER_Bx149, "TimerB");
timerConfig = new TimerConfig[] {timerA, timerB};
/* TX Vec, RX Vec, TX Bit, RX Bit, SFR-reg, Offset, Name, A?*/

13
se/sics/mspsim/core/MSP430Core.java
View File

@ -212,11 +212,12 @@ public class MSP430Core extends Chip implements MSP430Constants {
/* TODO: this range is only valid for the F1611 series (Sky, etc) */
flash = new Flash(this, memory,
new FlashRange(0x4000, 0x10000, 512, 64),
new FlashRange(0x1000, 0x01100, 128, 64));
for (int i = 0x128; i < 0x12e; i++) {
memOut[i] = flash;
memIn[i] = flash;
new FlashRange(config.mainFlashStart, config.mainFlashStart + config.mainFlashSize, 512, 64),
new FlashRange(config.infoMemStart, config.infoMemStart + config.infoMemSize, 128, 64),
0x128);
for (int i = 0; i < 8; i++) {
memOut[i + 0x128] = flash;
memIn[i + 0x128] = flash;
}
sfr = new SFR(this, memory);
@ -627,7 +628,7 @@ public class MSP430Core extends Chip implements MSP430Constants {
cycleEventQueue.removeAll();
vTimeEventQueue.removeAll();
bcs.reset();
bcs.reset(0);
for (Chip chip : chips) {
chip.notifyReset();
}