RuiFPB/ksymon
1
0 Fork 0
forked from public_mirrors/symon
Code Pull Requests Actions Releases 2 Activity

Merge branch 'master' into crtc

Browse Source 
Conflicts:
	src/main/java/com/loomcom/symon/Simulator.java
	src/main/java/com/loomcom/symon/devices/Device.java
	src/main/java/com/loomcom/symon/devices/Memory.java
This commit is contained in:
Seth Morabito committed 2013-12-28 23:35:22 -08:00
2 parents 3c68c63995 e9a9786135
commit 070e9db813
10 files changed
+51 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/loomcom/symon/devices/Crtc.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class Crtc extends Device {
private Memory memory;
public Crtc(int deviceAddress, Memory memory) throws MemoryRangeException, IOException {
super(deviceAddress, 2, "CRTC");
super(deviceAddress, deviceAddress + 2, "CRTC");
this.memory = memory;
// Defaults