ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ZXHawk: removed all Rand() references from weak sector disk read implementation (now all speedlock protected games should load *every* time without issue)

This commit is contained in:
Asnivor 2018-06-19 14:30:44 +01:00
parent 9bdcc81863
commit 6a3377417e
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -480,6 +480,9 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
ExecBuffer[buffPos++] = sector.ActualData[i];
}
// mark the sector read
sector.SectorReadCompleted();
// any CRC errors?
if (Status1.Bit(SR1_DE) || Status2.Bit(SR2_DD))
{
@ -806,6 +809,9 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
ExecBuffer[buffPos++] = sector.ActualData[i];
}
// mark the sector read
sector.SectorReadCompleted();
if (sector.SectorID == ActiveCommandParams.EOT)
{
// this was the last sector to read
@ -1044,6 +1050,9 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
ExecBuffer[buffPos++] = sec.ActualData[b];
}
// mark the sector read
sec.SectorReadCompleted();
// end of sector - compare IDs
if (sec.TrackNumber != ActiveCommandParams.Cylinder ||
sec.SideNumber != ActiveCommandParams.Head ||

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
View File

@ -857,7 +857,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
#endregion
#region StateSerialization
#region StateSerialization
public void SyncState(Serializer ser)
{

23
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs
View File

@ -636,6 +636,14 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
public byte[] SectorData { get; set; }
public bool ContainsMultipleWeakSectors { get; set; }
public int WeakReadIndex = 0;
public void SectorReadCompleted()
{
if (ContainsMultipleWeakSectors)
WeakReadIndex++;
}
public int DataLen
{
get
@ -681,6 +689,20 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
}
else
{
// weak read neccessary
int copies = ActualDataByteLength / (0x80 << SectorSize);
// handle index wrap-around
if (WeakReadIndex > copies - 1)
WeakReadIndex = copies - 1;
// get the sector data based on the current weakreadindex
int step = WeakReadIndex * (0x80 << SectorSize);
byte[] res = new byte[(0x80 << SectorSize)];
Array.Copy(SectorData, step, res, 0, 0x80 << SectorSize);
return res;
/*
int copies = ActualDataByteLength / (0x80 << SectorSize);
Random rnd = new Random();
int r = rnd.Next(0, copies - 1);
@ -688,6 +710,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
byte[] res = new byte[(0x80 << SectorSize)];
Array.Copy(SectorData, step, res, 0, 0x80 << SectorSize);
return res;
*/
}
}
}