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

Possible values for portwrite 0,1,x 

but x not implemented therefore now 0 is returned
This commit is contained in:
Admin 2015-10-07 08:50:12 +02:00
parent 243797edc7
commit c8c2b69662
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
se/sics/mspsim/core/IOPort.java
View File

@ -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) {

2
se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java
View File

@ -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;
}