diff --git a/se/sics/mspsim/core/IOPort.java b/se/sics/mspsim/core/IOPort.java index 1db7a2b..cbc7162 100644 --- a/se/sics/mspsim/core/IOPort.java +++ b/se/sics/mspsim/core/IOPort.java @@ -309,11 +309,12 @@ public class IOPort extends IOUnit { } } + //Possible Output 0,1,x but x not implemented therefore 0 is returned private int CalcPortOut(){ int selactive= sel ^ sel2; int selValCombine= ((sel & selValue) | (sel2 & selValue2 )) & selactive; int outVal=(~selactive & out); - return (selValCombine | outVal | ~dir ) & 0xff; + return (selValCombine | (outVal & dir) ) & 0xff; } private void writePort(PortReg function, int data, long cycles) { diff --git a/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java b/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java index 7e123ee..d4b2d72 100644 --- a/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java +++ b/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java @@ -75,7 +75,7 @@ public class Exp5438Gui extends AbstractNodeGUI { }; public Exp5438Gui(Exp5438Node node) { - super("MSPSIM fork by Prof. Rüdiger Heintz 0.4.13", "images/MSP-EXP430F5438.jpg"); + super("MSPSIM fork by Prof. Rüdiger Heintz 0.4.15", "images/MSP-EXP430F5438.jpg"); this.node = node; }