Reworked pal interface a bit

src/net/hkzlab/devices/PAL16R4Specs.java

@@ -23,13 +23,45 @@ public class PAL16R4Specs implements PALSpecsInterface {
     }
 
     @Override
-    public int getCLKPin() {
-        return 1;
+    public int getCLKPinMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getOEPinMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getINMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getOUTMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getIO_INMask() {
+        // TODO Auto-generated method stub
+        return 0;
     }
 
     @Override
-    public int getOEPin() {
-        return 11;
+    public int getIO_OUTMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getROUTMask() {
+        // TODO Auto-generated method stub
+        return 0;
     }
 
 }

src/net/hkzlab/devices/PAL16R6Specs.java

@@ -23,13 +23,45 @@ public class PAL16R6Specs implements PALSpecsInterface {
     }
 
     @Override
-    public int getCLKPin() {
-        return 1;
+    public int getCLKPinMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getOEPinMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getINMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getOUTMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getIO_INMask() {
+        // TODO Auto-generated method stub
+        return 0;
     }
 
     @Override
-    public int getOEPin() {
-        return 11;
+    public int getIO_OUTMask() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getROUTMask() {
+        // TODO Auto-generated method stub
+        return 0;
     }
 
 }

src/net/hkzlab/devices/PALSpecsInterface.java

@@ -6,6 +6,11 @@ public interface PALSpecsInterface {
     public int getNumOUTPins();
     public int getNumROUTPins();
 
-    public int getCLKPin();
-    public int getOEPin();
+    public int getCLKPinMask();
+    public int getOEPinMask();
+    public int getINMask();
+    public int getOUTMask();
+    public int getIO_INMask();
+    public int getIO_OUTMask();
+    public int getROUTMask();
 }

src/net/hkzlab/palanalisys/MacroState.java

@@ -11,7 +11,7 @@ public class MacroState {
 
     public final SubState[] substates;
     public final StateLink[] links;
-    private final HashMap<Integer, SubState> ssMap;
+    public final HashMap<Integer, SubState> ssMap;
 
     public MacroState(final String tag, final boolean[] rpin_status, final int outPins, final int inPins) {
         this.tag = tag;

src/net/hkzlab/palanalisys/SubState.java

@@ -47,11 +47,11 @@ public class SubState {
         return true;
     }
 
-    public static int calculateSubStateIndex(final byte[] pinStatus) {
+    public static int calculateSubStateIndex(final boolean[] inputs) {
         int index = 0;
 
-        for(int idx = 0; idx < pinStatus.length; idx++) {
-            index += ((pinStatus[idx] + 1) & 0xFF) * (3^idx);
+        for(int idx = 0; idx < inputs.length; idx++) {
+            index += ((inputs[idx] ? 1 : 0) << idx);
         }
 
         return index;