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

fixed bug

This commit is contained in:
Joakim Eriksson 2012-05-14 17:08:12 +02:00
parent a8fd64694b
commit fdc856247f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
se/sics/mspsim/chip/SPICommand.java
View File

@ -58,13 +58,17 @@ public class SPICommand {
for (int i = 1; i < subs.length; i++) {
/* not more than first byte */
if (subs[i].equals("1")) {
value = (value << 1) + 1;
mask = (mask << 1) | 1;
bitCount++;
if (c < 8) {
value = (value << 1) + 1;
mask = (mask << 1) | 1;
bitCount++;
}
} else if (subs[i].equals("0")) {
value = (value << 1);
mask = (mask << 1) | 1;
bitCount++;
if (c < 8) {
value = (value << 1);
mask = (mask << 1) | 1;
bitCount++;
}
} else if (subs[i].equals(currentName)) {
/* do nothing */
} else {
@ -75,7 +79,7 @@ public class SPICommand {
bitFields = new ArrayList<SPICommand.BitField>();
bitFields.add(new BitField(currentName, start, c - 1));
} else {
System.out.println("C: " + c);
System.out.printf("C: %d value: %x mask: %x \n", c, value, mask);
if (c < 8) {
value = value << (8 - c);
mask = mask << (8 - c);
@ -91,8 +95,8 @@ public class SPICommand {
start + " - " + (c - 1) + "]");
}
System.out.printf("Value %x\n",value);
System.out.printf("Mask %x\n",value);
System.out.printf("Value %x\n", value);
System.out.printf("Mask %x\n", mask);
}
/* return -1 if no match */