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

CdRom: Remove Speed field/add accessor instead 

This way it doesn't break save states.
This commit is contained in:
Connor McLaughlin 2022-04-17 20:25:41 +10:00 committed by refractionpcsx2
parent 1f04214461
commit b10249af7d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/CDVD/CdRom.cpp
View File

@ -131,6 +131,11 @@ uint sectorSeekReadDelay = 0x800; // for calculated seek delays
static void AddIrqQueue(u8 irq, u32 ecycle); static void AddIrqQueue(u8 irq, u32 ecycle);
static __fi int GetCDSpeed()
{
return 1 + ((cdr.Mode >> 7) & 0x1);
}
static __fi void StartReading(u32 type) static __fi void StartReading(u32 type)
{ {
cdr.Reading = type; cdr.Reading = type;
@ -862,7 +867,6 @@ void cdrWrite1(u8 rt)
cdr.Mode = cdr.Param[0]; cdr.Mode = cdr.Param[0];
cdr.Ctrl |= 0x80; cdr.Ctrl |= 0x80;
cdr.Stat = NoIntr; cdr.Stat = NoIntr;
cdr.Speed = 1 + ((cdr.Mode >> 7) & 0x1);
if (cdr.Mode & MODE_CDDA) if (cdr.Mode & MODE_CDDA)
{ {
StopCdda(); StopCdda();

1
pcsx2/CDVD/CdRom.h
View File

@ -69,7 +69,6 @@ struct cdrStruct
u8 SetSectorSeek[4]; u8 SetSectorSeek[4];
u8 Track; u8 Track;
int Play; int Play;
int Speed;
int CurTrack; int CurTrack;
int Mode, File, Channel, Muted; int Mode, File, Channel, Muted;
int Reset; int Reset;