diff --git a/src/main/java/com/loomcom/symon/devices/Via.java b/src/main/java/com/loomcom/symon/devices/Pia.java similarity index 91% rename from src/main/java/com/loomcom/symon/devices/Via.java rename to src/main/java/com/loomcom/symon/devices/Pia.java index af91eae..6660932 100644 --- a/src/main/java/com/loomcom/symon/devices/Via.java +++ b/src/main/java/com/loomcom/symon/devices/Pia.java @@ -26,8 +26,8 @@ package com.loomcom.symon.devices; import com.loomcom.symon.exceptions.MemoryAccessException; import com.loomcom.symon.exceptions.MemoryRangeException; -public class Via extends Device { - public static final int VIA_SIZE = 16; +public class Pia extends Device { + public static final int PIA_SIZE = 16; private static final int ORB = 0; private static final int ORA = 1; @@ -46,13 +46,13 @@ public class Via extends Device { private static final int IER = 14; private static final int ORA_H = 15; - public Via(int address) throws MemoryRangeException { - super(address, address + VIA_SIZE - 1, "VIA"); + public Pia(int address) throws MemoryRangeException { + super(address, address + PIA_SIZE - 1, "PIA"); } @Override public void write(int address, int data) throws MemoryAccessException { - + ; // No-Op } @Override diff --git a/src/main/java/com/loomcom/symon/machines/Machine.java b/src/main/java/com/loomcom/symon/machines/Machine.java index de54671..deea6ff 100644 --- a/src/main/java/com/loomcom/symon/machines/Machine.java +++ b/src/main/java/com/loomcom/symon/machines/Machine.java @@ -29,7 +29,7 @@ import com.loomcom.symon.Cpu; import com.loomcom.symon.devices.Acia; import com.loomcom.symon.devices.Crtc; import com.loomcom.symon.devices.Memory; -import com.loomcom.symon.devices.Via; +import com.loomcom.symon.devices.Pia; import com.loomcom.symon.exceptions.MemoryRangeException; @@ -43,7 +43,7 @@ public interface Machine { public Acia getAcia(); - public Via getVia(); + public Pia getPia(); public Crtc getCrtc(); diff --git a/src/main/java/com/loomcom/symon/machines/MulticompMachine.java b/src/main/java/com/loomcom/symon/machines/MulticompMachine.java index b4f8b52..0ff12f1 100644 --- a/src/main/java/com/loomcom/symon/machines/MulticompMachine.java +++ b/src/main/java/com/loomcom/symon/machines/MulticompMachine.java @@ -30,7 +30,7 @@ import com.loomcom.symon.devices.Acia; import com.loomcom.symon.devices.Acia6850; import com.loomcom.symon.devices.Crtc; import com.loomcom.symon.devices.Memory; -import com.loomcom.symon.devices.Via; +import com.loomcom.symon.devices.Pia; import com.loomcom.symon.exceptions.MemoryRangeException; import java.io.File; import java.util.logging.Logger; @@ -111,7 +111,7 @@ public class MulticompMachine implements Machine { } @Override - public Via getVia() { + public Pia getPia() { return null; } diff --git a/src/main/java/com/loomcom/symon/machines/SimpleMachine.java b/src/main/java/com/loomcom/symon/machines/SimpleMachine.java index 5c434f5..1291df4 100644 --- a/src/main/java/com/loomcom/symon/machines/SimpleMachine.java +++ b/src/main/java/com/loomcom/symon/machines/SimpleMachine.java @@ -5,7 +5,7 @@ import com.loomcom.symon.Cpu; import com.loomcom.symon.devices.Acia; import com.loomcom.symon.devices.Crtc; import com.loomcom.symon.devices.Memory; -import com.loomcom.symon.devices.Via; +import com.loomcom.symon.devices.Pia; import com.loomcom.symon.exceptions.MemoryRangeException; /** @@ -52,7 +52,7 @@ public class SimpleMachine implements Machine { } @Override - public Via getVia() { + public Pia getPia() { return null; } diff --git a/src/main/java/com/loomcom/symon/machines/SymonMachine.java b/src/main/java/com/loomcom/symon/machines/SymonMachine.java index 3b4dac4..09668f6 100644 --- a/src/main/java/com/loomcom/symon/machines/SymonMachine.java +++ b/src/main/java/com/loomcom/symon/machines/SymonMachine.java @@ -30,7 +30,7 @@ import com.loomcom.symon.devices.Acia; import com.loomcom.symon.devices.Acia6551; import com.loomcom.symon.devices.Crtc; import com.loomcom.symon.devices.Memory; -import com.loomcom.symon.devices.Via; +import com.loomcom.symon.devices.Pia; import com.loomcom.symon.exceptions.MemoryRangeException; import java.io.File; import java.util.logging.Logger; @@ -48,9 +48,9 @@ public class SymonMachine implements Machine { private static final int MEMORY_BASE = 0x0000; private static final int MEMORY_SIZE = 0x8000; - // VIA at $8000-$800F + // PIA at $8000-$800F - private static final int VIA_BASE = 0x8000; + private static final int PIA_BASE = 0x8000; // ACIA at $8800-$8803 private static final int ACIA_BASE = 0x8800; @@ -68,7 +68,7 @@ public class SymonMachine implements Machine { private final Bus bus; private final Cpu cpu; private final Acia acia; - private final Via via; + private final Pia pia; private final Crtc crtc; private final Memory ram; private Memory rom; @@ -78,13 +78,13 @@ public class SymonMachine implements Machine { this.bus = new Bus(BUS_BOTTOM, BUS_TOP); this.cpu = new Cpu(); this.ram = new Memory(MEMORY_BASE, MEMORY_BASE + MEMORY_SIZE - 1, false); - this.via = new Via(VIA_BASE); + this.pia = new Pia(PIA_BASE); this.acia = new Acia6551(ACIA_BASE); this.crtc = new Crtc(CRTC_BASE, ram); bus.addCpu(cpu); bus.addDevice(ram); - bus.addDevice(via); + bus.addDevice(pia); bus.addDevice(acia); bus.addDevice(crtc); @@ -124,8 +124,8 @@ public class SymonMachine implements Machine { } @Override - public Via getVia() { - return via; + public Pia getPia() { + return pia; } @Override