From 5306c84327293aec2645e21056a983a2e1d67870 Mon Sep 17 00:00:00 2001 From: fabian Date: Tue, 9 Dec 2014 17:54:47 +0100 Subject: [PATCH 1/2] Bug Fix, address 0x01A8, length 2, is also used by ADC12 (Interrupt vector word, ADC12IV). Referring to MSP430x1xx datasheet, 17-20, 17.3. --- se/sics/mspsim/config/MSP430f1611Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/se/sics/mspsim/config/MSP430f1611Config.java b/se/sics/mspsim/config/MSP430f1611Config.java index 99e4dfc..79b8ee2 100644 --- a/se/sics/mspsim/config/MSP430f1611Config.java +++ b/se/sics/mspsim/config/MSP430f1611Config.java @@ -113,7 +113,7 @@ public class MSP430f1611Config extends MSP430Config { cpu.setIORange(0x080, 16, adc12); cpu.setIORange(0x140, 16, adc12); cpu.setIORange(0x150, 16, adc12); - cpu.setIORange(0x1a0, 8, adc12); + cpu.setIORange(0x1a0, 10, adc12); return 3 + 6; } From 7bf029f7bbdcd0ad86bff18f77df21d7f2f99777 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 12 Dec 2014 21:13:39 +0100 Subject: [PATCH 2/2] Same bug as before in different config --- se/sics/mspsim/config/MSP430f2617Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/se/sics/mspsim/config/MSP430f2617Config.java b/se/sics/mspsim/config/MSP430f2617Config.java index 6f450e9..8425c65 100644 --- a/se/sics/mspsim/config/MSP430f2617Config.java +++ b/se/sics/mspsim/config/MSP430f2617Config.java @@ -127,7 +127,7 @@ public class MSP430f2617Config extends MSP430Config { cpu.setIORange(0x080, 16, adc12); cpu.setIORange(0x140, 16, adc12); cpu.setIORange(0x150, 16, adc12); - cpu.setIORange(0x1a0, 8, adc12); + cpu.setIORange(0x1a0, 10, adc12); /* 4 usci units + 6 io port*/ return 4 + 6;