From 3674824889ce21570873246b28b136e0dac47b4f Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Mon, 8 Nov 2021 17:53:34 -0500
Subject: [PATCH] A7800Hawk; Misc bug fixes
---
.../Atari/A7800Hawk/A7800Hawk.IStatable.cs | 1 +
.../Consoles/Atari/A7800Hawk/A7800Hawk.cs | 2 +-
.../Atari/A7800Hawk/A7800HawkControllers.cs | 9 ++++++++-
.../Consoles/Atari/A7800Hawk/M6532.cs | 3 +++
.../Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs | 3 +++
.../Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs | 14 ++++++++++++++
6 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
index d20ad4514e..7005dcff17 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
@@ -29,6 +29,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Sync(nameof(RAM), ref RAM, false);
ser.Sync(nameof(RAM_6532), ref RAM_6532, false);
ser.Sync(nameof(hs_bios_mem), ref hs_bios_mem, false);
+ ser.Sync(nameof(_hsram), ref _hsram, false);
ser.Sync(nameof(cycle), ref cycle);
ser.Sync(nameof(cpu_cycle), ref cpu_cycle);
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
index 7a8e45256d..9ef3576a8a 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
@@ -30,11 +30,11 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public byte[] RAM = new byte[0x1000];
public byte[] RAM_6532 = new byte[0x80];
public byte[] hs_bios_mem = new byte[0x800];
+ public byte[] _hsram = new byte[2048];
public readonly byte[] _rom;
public readonly byte[] _hsbios;
public readonly byte[] _bios;
- public readonly byte[] _hsram = new byte[2048];
private int _frame = 0;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
index 38b9b3a85a..f78d9bbb72 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
@@ -45,7 +45,14 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public byte Read(IController c)
{
- return 0;
+ byte result = 0xF;
+
+ if (PortNum == 1)
+ {
+ result = (byte)(result << 4);
+ }
+
+ return result;
}
public byte ReadFire(IController c)
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs
index b01b16c5c3..99aff809a2 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs
@@ -191,6 +191,9 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
Timer.Value = 0x73;
Timer.PrescalerShift = 10;
Timer.PrescalerCount = 1 << Timer.PrescalerShift;
+ Timer.InterruptEnabled = false;
+ Timer.InterruptFlag = false;
+ Timer.Overflowed = false;
_ddRa = 0x00;
_ddRb = 0x00;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs
index 9cdec46a32..9fbd6aff07 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs
@@ -26,6 +26,9 @@
_capCharging = false;
AudioClocks = 0;
_doTicks = false;
+ BusState = 0;
+ AUD[0].Reset();
+ AUD[1].Reset();
}
// Execute TIA cycles
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
index 817650970b..538f183424 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
@@ -204,6 +204,20 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Sync(nameof(freqcnt), ref freqcnt);
ser.Sync(nameof(on), ref on);
}
+
+ public void Reset()
+ {
+ AUDC = 0;
+ AUDF = 1;
+ AUDV = 0;
+ sr1 = true;
+ sr4 = 0x0f;
+ sr5 = 0x1f;
+ sr9 = 0x1ff;
+ sr3 = 2;
+ freqcnt = 0;
+ on = true;
+ }
}
}
}