Add device selector switch to PIAs.

Author: craigthomas

src/main/java/ca/craigthomas/yacoco3e/components/DeviceSelectorSwitch.java

@@ -0,0 +1,30 @@
+package ca.craigthomas.yacoco3e.components;
+
+public class DeviceSelectorSwitch
+{
+    protected int switchPosition;
+    protected int CB2;
+    protected int CA2;
+
+    public DeviceSelectorSwitch() {
+        switchPosition = 0;
+        CB2 = 0;
+        CA2 = 0;
+    }
+
+    public void setCB2(boolean isSet) {
+        CB2 = (isSet) ? 1 : 0;
+        switchPosition = (CB2 << 1) + CA2;
+        System.out.println("New switch position = " + switchPosition);
+    }
+
+    public void setCA2(boolean isSet) {
+        CA2 = (isSet) ? 1 : 0;
+        switchPosition = (CB2 << 1) + CA2;
+        System.out.println("New switch position = " + switchPosition);
+    }
+
+    public int getSwitchPosition() {
+        return switchPosition;
+    }
+}

src/main/java/ca/craigthomas/yacoco3e/components/IOController.java

@@ -46,14 +46,8 @@ public class IOController
     protected PIA2a pia2a;
     protected PIA2b pia2b;
 
-    /* PIA2 */
-    protected UnsignedByte pia2DRA;  /* PIA 2 Data Register A */
-    protected UnsignedByte pia2CRA;  /* PIA 2 Control Register A*/
-    protected UnsignedByte pia2DDRA; /* PIA 2 Data Direction Register A */
-
-    protected UnsignedByte pia2DRB;
-    protected UnsignedByte pia2CRB;
-    protected UnsignedByte pia2DDRB;
+    /* Device Selector */
+    protected DeviceSelectorSwitch deviceSelectorSwitch;
 
     /* Video mode related functions */
     protected UnsignedByte samControlBits;
@@ -118,26 +112,19 @@ public IOController(Memory memory, RegisterSet registerSet, Keyboard keyboard, S
         /* Screen controls */
         samControlBits = new UnsignedByte();
 
+        /* Device Selector */
+        deviceSelectorSwitch = new DeviceSelectorSwitch();
+
         /* PIAs */
-        pia1a = new PIA1a(keyboard);
-        pia1b = new PIA1b(keyboard);
+        pia1a = new PIA1a(keyboard, deviceSelectorSwitch);
+        pia1b = new PIA1b(keyboard, deviceSelectorSwitch);
         pia2a = new PIA2a(cassette);
         pia2b = new PIA2b(this);
 
         /* Display registers */
         verticalOffsetRegister = new UnsignedWord(0x0400);
         samDisplayOffsetRegister = new UnsignedByte(0x0);
 
-        /* PIAs */
-
-        pia2CRA = new UnsignedByte(0);
-        pia2DRA = new UnsignedByte(0);
-        pia2DDRA = new UnsignedByte(0);
-
-        pia2CRB = new UnsignedByte(0);
-        pia2DRB = new UnsignedByte(0);
-        pia2DDRB = new UnsignedByte(0);
-
         /* Interrupts */
         irqStatus = new UnsignedByte();
         firqStatus = new UnsignedByte();

src/main/java/ca/craigthomas/yacoco3e/components/PIA1a.java

@@ -12,12 +12,14 @@
 public class PIA1a extends PIA
 {
     protected Keyboard keyboard;
+    protected DeviceSelectorSwitch deviceSelectorSwitch;
     protected int timerValue;
 
-    public PIA1a(Keyboard newKeyboard) {
+    public PIA1a(Keyboard newKeyboard, DeviceSelectorSwitch newDeviceSelectorSwitch) {
         super();
         keyboard = newKeyboard;
         timerValue = 0;
+        deviceSelectorSwitch = newDeviceSelectorSwitch;
     }
 
     /**
@@ -50,9 +52,19 @@ public void setDataRegister(UnsignedByte newDataRegister) {
      */
     @Override
     public void setControlRegister(UnsignedByte newControlRegister) {
-        controlRegister = new UnsignedByte(newControlRegister.getShort() +
+        controlRegister = new UnsignedByte(
+                newControlRegister.getShort() +
                         (controlRegister.isMasked(0x80) ? 0x80 : 0) +
-                        (controlRegister.isMasked(0x40) ? 0x40 : 0));
+                        (controlRegister.isMasked(0x40) ? 0x40 : 0)
+        );
+
+        // Bit 5=1 - CA2 is an output
+        if (controlRegister.isMasked(0x10)) {
+            // Bit 4=1 - Output a signal directly on CA2 based on Bit 3 value
+            if (controlRegister.isMasked(0x8)) {
+                deviceSelectorSwitch.setCA2(controlRegister.isMasked(0x4));
+            }
+        }
     }
 
     /**

src/main/java/ca/craigthomas/yacoco3e/components/PIA1b.java

@@ -12,11 +12,13 @@
 public class PIA1b extends PIA
 {
     protected Keyboard keyboard;
+    protected DeviceSelectorSwitch deviceSelectorSwitch;
     protected int timerValue;
 
-    public PIA1b(Keyboard newKeyboard) {
+    public PIA1b(Keyboard newKeyboard, DeviceSelectorSwitch newDeviceSelectorSwitch) {
         super();
         keyboard = newKeyboard;
+        deviceSelectorSwitch = newDeviceSelectorSwitch;
         timerValue = 0;
     }
 
@@ -56,6 +58,14 @@ public void setControlRegister(UnsignedByte newControlRegister) {
                 (controlRegister.isMasked(0x80) ? 0x80 : 0) +
                 (controlRegister.isMasked(0x40) ? 0x40 : 0)
         );
+
+        // Bit 5=1 - CB2 is an output
+        if (controlRegister.isMasked(0x10)) {
+            // Bit 4=1 - Output a signal directly on CB2 based on Bit 3 value
+            if (controlRegister.isMasked(0x8)) {
+                deviceSelectorSwitch.setCB2(controlRegister.isMasked(0x4));
+            }
+        }
     }
 
     /**