ZXHawk: +3/+2a writes to 0x1ffd and 0x7ffd decoded more faithfully

TASEmulators · Aug 20, 2018 · 7ff4cea · 7ff4cea
1 parent 6a5b77c
commit 7ff4cea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs b/...ulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
@@ -75,7 +75,7 @@ public override void WritePort(ushort port, byte value)
             AYDevice.WritePort(port, value);
 
             // port 0x7ffd - hardware should only respond when bits 1 & 15 are reset and bit 14 is set
-            if (port == 0x7ffd)
+            if (!portBits[1] && !portBits[15] && portBits[14])
             {
                 if (!PagingDisabled)
                 {
@@ -95,7 +95,7 @@ public override void WritePort(ushort port, byte value)
                 }
             }
             // port 0x1ffd - hardware should only respond when bits 1, 13, 14 & 15 are reset and bit 12 is set
-            if (port == 0x1ffd)
+            if (!portBits[1] && portBits[12] && !portBits[13] && !portBits[14] && !portBits[15])
             {
                 if (!PagingDisabled)
                 {

diff --git a/...Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs b/...Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
@@ -81,7 +81,7 @@ public override void WritePort(ushort port, byte value)
             UPDDiskDevice.WritePort(port, value);
 
             // port 0x7ffd - hardware should only respond when bits 1 & 15 are reset and bit 14 is set
-            if (port == 0x7ffd)
+            if (!portBits[1] && !portBits[15] && portBits[14])
             {
                 if (!PagingDisabled)
                 {
@@ -101,7 +101,7 @@ public override void WritePort(ushort port, byte value)
                 }                         
             }
             // port 0x1ffd - hardware should only respond when bits 1, 13, 14 & 15 are reset and bit 12 is set
-            if (port == 0x1ffd)
+            if (!portBits[1] && portBits[12] && !portBits[13] && !portBits[14] && !portBits[15])
             {
                 if (!PagingDisabled)
                 {