Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only access SCSI device at 0xC0xxxxxx if it has been configured to do so

Browse source 
Fixes some step 1.5 games not working in last update
This commit is contained in:
gm-matthew 2024-05-04 19:43:02 +01:00
parent 2245fca796
commit 3e394d1257
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Src/Model3/53C810.cpp
View file

@ -458,6 +458,14 @@ UINT32 C53C810::ReadPCIConfigSpace(unsigned device, unsigned reg, unsigned bits,
void C53C810::WritePCIConfigSpace(unsigned device, unsigned reg, unsigned bits, unsigned offset, UINT32 data) void C53C810::WritePCIConfigSpace(unsigned device, unsigned reg, unsigned bits, unsigned offset, UINT32 data)
{ {
DebugLog("53C810 PCI %d-bit write request for reg=%02X, data=%08X\n", bits, reg, data); DebugLog("53C810 PCI %d-bit write request for reg=%02X, data=%08X\n", bits, reg, data);
if (reg == 4) // set base address of SCSI device
baseAddress = data & 0xFF;
}
UINT8 C53C810::GetBaseAddress(void)
{
return baseAddress;
} }
void C53C810::Reset(void) void C53C810::Reset(void)

10
Src/Model3/53C810.h
View file

@ -156,6 +156,13 @@ public:
*/ */
void WritePCIConfigSpace(unsigned device, unsigned reg, unsigned bits, unsigned width, UINT32 data); void WritePCIConfigSpace(unsigned device, unsigned reg, unsigned bits, unsigned width, UINT32 data);
/*
* GetBaseAddress(void):
*
* Retrieves the base address of the SCSI device.
*/
UINT8 GetBaseAddress(void);
/* /*
* Reset(void): * Reset(void):
* *
@ -201,6 +208,9 @@ private:
// IRQ controller and IRQ identifier for this SCSI controller // IRQ controller and IRQ identifier for this SCSI controller
CIRQ *IRQ; CIRQ *IRQ;
unsigned scsiIRQ; unsigned scsiIRQ;
// Base address of the SCSI device (varies by game)
UINT8 baseAddress;
}; };

16
Src/Model3/Model3.cpp
View file

@ -1017,7 +1017,7 @@ UINT8 CModel3::Read8(UINT32 addr)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // only on Step 1.x case 0xC0: // only on Step 1.x
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_stepping > 0x15) if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0)
{ {
//printf("Model3 : Read8 %x\n", addr); //printf("Model3 : Read8 %x\n", addr);
break; break;
@ -1049,7 +1049,7 @@ UINT8 CModel3::Read8(UINT32 addr)
break; break;
} }
} }
else if (m_stepping > 0x15) break; else if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -1311,7 +1311,7 @@ UINT32 CModel3::Read32(UINT32 addr)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // only on Step 1.x case 0xC0: // only on Step 1.x
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_stepping > 0x15) // check for Step 1.x if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0) // check for Step 1.x
break; break;
#endif #endif
#ifdef NET_BOARD #ifdef NET_BOARD
@ -1346,7 +1346,7 @@ UINT32 CModel3::Read32(UINT32 addr)
} }
} }
else if (m_stepping > 0x15) break; else if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -1468,7 +1468,7 @@ void CModel3::Write8(UINT32 addr, UINT8 data)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // only on Step 1.x case 0xC0: // only on Step 1.x
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_stepping > 0x15) if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0)
goto Unknown8; goto Unknown8;
#endif #endif
#ifdef NET_BOARD #ifdef NET_BOARD
@ -1503,7 +1503,7 @@ void CModel3::Write8(UINT32 addr, UINT8 data)
break; break;
} }
else if (m_stepping > 0x15) break; else if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -1790,7 +1790,7 @@ void CModel3::Write32(UINT32 addr, UINT32 data)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // step 1.x only case 0xC0: // step 1.x only
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_stepping > 0x15) if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0)
goto Unknown32; goto Unknown32;
#endif #endif
#ifdef NET_BOARD #ifdef NET_BOARD
@ -1825,7 +1825,7 @@ void CModel3::Write32(UINT32 addr, UINT32 data)
break; break;
} }
else if (m_stepping > 0x15) break; else if (m_stepping > 0x15 || SCSI.GetBaseAddress() != 0xC0) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1: