Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Phasor's Echo+ mode to use correct AYs (#1183)

This commit is contained in:
tomcw 2023-02-19 21:22:44 +00:00
parent 13ee80686c
commit cc07dc7f7b
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/Mockingboard.cpp
View File

@ -198,25 +198,16 @@ void MockingboardCard::WriteToORB(BYTE subunit)
{
const int kAY0 = 2; // bit4=0 (active low) selects the 1st AY8913, ie. the only AY8913 in Mockingboard mode (confirmed on real Phasor h/w)
const int kAY1 = 1; // bit3=0 (active low) selects the 2nd AY8913 attached to this 6522 (unavailable in Mockingboard mode)
const int nAY_CS = (m_phasorMode == PH_Mockingboard) ? kAY0 : (~(value >> 3) & 3);
if (m_phasorMode == PH_EchoPlus)
{
int nAY_CS = (value >> 3) & 3;
if (nAY_CS & kAY0)
AY8910_Write(0, AY8913_DEVICE_A, value);
subunit = SY6522_DEVICE_B;
if (nAY_CS & kAY1)
AY8910_Write(1, AY8913_DEVICE_A, value);
}
else
{
int nAY_CS = (m_phasorMode == PH_Phasor) ? (~(value >> 3) & 3) : kAY0;
if (nAY_CS & kAY0)
AY8910_Write(subunit, AY8913_DEVICE_A, value);
if (nAY_CS & kAY0)
AY8910_Write(subunit, AY8913_DEVICE_A, value);
if (nAY_CS & kAY1)
AY8910_Write(subunit, AY8913_DEVICE_B, value);
}
if (nAY_CS & kAY1)
AY8910_Write(subunit, AY8913_DEVICE_B, value);
}
else
{
@ -249,7 +240,7 @@ void MockingboardCard::AY8910_Write(BYTE subunit, BYTE ay, BYTE value)
MockingboardUnitState_e& state = (ay == AY8913_DEVICE_A) ? pMB->state : pMB->stateB; // GH#659
#if _DEBUG
if (!m_phasorEnable || m_phasorMode != PH_Phasor)
if (!m_phasorEnable || m_phasorMode == PH_Mockingboard)
_ASSERT(ay == AY8913_DEVICE_A);
if (nAYFunc == AY_READ || nAYFunc == AY_WRITE || nAYFunc == AY_LATCH)
_ASSERT(state == AY_INACTIVE);