Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-08 01:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Remove todo for MB_Read().

Browse Source
This commit is contained in:
tomch 2013-03-22 20:54:14 +00:00
parent 0004e290c4
commit 0732779eeb
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AppleWin/source/Memory.cpp
View File

@ -582,7 +582,6 @@ BYTE __stdcall IORead_Cxxx(WORD programcounter, WORD address, BYTE write, BYTE v
if (address >= APPLE_SLOT_BEGIN && address <= APPLE_SLOT_END)
{
// TODO:CHECK: NB. Currently Mockingboard/Phasor is never unplugged, just disabled. See MB_Read().
// Fix for bug 18643 and bug 18886
const UINT uSlot = (address>>8)&0x7;
if ( (SW_SLOTCXROM) && // Peripheral (card) ROMs enabled in $C100..$C7FF

22
AppleWin/source/Mockingboard.cpp
View File

@ -1406,14 +1406,19 @@ static BYTE __stdcall MB_Read(WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, ULO
{
MB_UpdateCycles(nCyclesLeft);
#ifdef _DEBUG
if(!IS_APPLE2 && !MemCheckSLOTCXROM())
return mem[nAddr];
if(g_SoundcardType == CT_Empty) // TODO: Should really unplug the card from the slot and let IORead_Cxxx() return the floating bus
{
_ASSERT(0); // Should not occur now
_ASSERT(0); // Card ROM disabled, so IORead_Cxxx() returns the internal ROM
return mem[nAddr];
}
if(g_SoundcardType == CT_Empty)
{
_ASSERT(0); // Card unplugged, so IORead_Cxxx() returns the floating bus
return MemReadFloatingBus(nCyclesLeft);
}
#endif
BYTE nMB = (nAddr>>8)&0xf - SLOT4;
BYTE nOffset = nAddr&0xff;
@ -1464,14 +1469,19 @@ static BYTE __stdcall MB_Write(WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, UL
{
MB_UpdateCycles(nCyclesLeft);
#ifdef _DEBUG
if(!IS_APPLE2 && !MemCheckSLOTCXROM())
{
_ASSERT(0); // Card ROM disabled, so IORead_Cxxx() returns the internal ROM
return 0;
}
if(g_SoundcardType == CT_Empty)
{
_ASSERT(0); // Should not occur now
_ASSERT(0); // Card unplugged, so IORead_Cxxx() returns the floating bus
return 0;
}
#endif
BYTE nMB = (nAddr>>8)&0xf - SLOT4;
BYTE nOffset = nAddr&0xff;
@ -1512,7 +1522,7 @@ static BYTE __stdcall MB_Write(WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, UL
//-----------------------------------------------------------------------------
static BYTE __stdcall PhasorIO (WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, ULONG nCyclesLeft)
static BYTE __stdcall PhasorIO(WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, ULONG nCyclesLeft)
{
if(!g_bPhasorEnable)
return MemReadFloatingBus(nCyclesLeft);