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

CDVD: Correct status sequence during disc swap.

This commit is contained in:
refractionpcsx2 2023-03-23 09:46:43 +00:00
parent ad12a3f735
commit 92b21ac9c2
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/CDVD/CDVD.cpp
View File

@ -703,6 +703,7 @@ s32 cdvdCtrlTrayClose()
DevCon.WriteLn(Color_Green, "Media already loaded (fast boot)"); DevCon.WriteLn(Color_Green, "Media already loaded (fast boot)");
cdvdUpdateReady(CDVD_DRIVE_READY); cdvdUpdateReady(CDVD_DRIVE_READY);
cdvdUpdateStatus(CDVD_STATUS_PAUSE); cdvdUpdateStatus(CDVD_STATUS_PAUSE);
cdvd.Spinning = true;
cdvd.Tray.trayState = CDVD_DISC_ENGAGED; cdvd.Tray.trayState = CDVD_DISC_ENGAGED;
cdvd.Tray.cdvdActionSeconds = 0; cdvd.Tray.cdvdActionSeconds = 0;
} }
@ -710,7 +711,8 @@ s32 cdvdCtrlTrayClose()
{ {
DevCon.WriteLn(Color_Green, "Detecting media"); DevCon.WriteLn(Color_Green, "Detecting media");
cdvdUpdateReady(CDVD_DRIVE_BUSY); cdvdUpdateReady(CDVD_DRIVE_BUSY);
cdvdUpdateStatus(CDVD_STATUS_SEEK); cdvdUpdateStatus(CDVD_STATUS_STOP);
cdvd.Spinning = false;
cdvd.Tray.trayState = CDVD_DISC_DETECTING; cdvd.Tray.trayState = CDVD_DISC_DETECTING;
cdvd.Tray.cdvdActionSeconds = 3; cdvd.Tray.cdvdActionSeconds = 3;
} }
@ -1443,22 +1445,18 @@ void cdvdUpdateTrayState()
case CDVD_DISC_DETECTING: case CDVD_DISC_DETECTING:
DevCon.WriteLn(Color_Green, "Seeking new disc"); DevCon.WriteLn(Color_Green, "Seeking new disc");
cdvd.Tray.trayState = CDVD_DISC_SEEKING; cdvd.Tray.trayState = CDVD_DISC_SEEKING;
cdvdUpdateStatus(CDVD_STATUS_SEEK);
cdvd.Tray.cdvdActionSeconds = 2; cdvd.Tray.cdvdActionSeconds = 2;
cdvd.Spinning = true;
break; break;
case CDVD_DISC_SEEKING: case CDVD_DISC_SEEKING:
cdvd.Spinning = true;
case CDVD_DISC_ENGAGED: case CDVD_DISC_ENGAGED:
cdvd.Tray.trayState = CDVD_DISC_ENGAGED; cdvd.Tray.trayState = CDVD_DISC_ENGAGED;
cdvdUpdateReady(CDVD_DRIVE_READY); cdvdUpdateReady(CDVD_DRIVE_READY);
cdvdUpdateStatus(CDVD_STATUS_PAUSE);
if (CDVDsys_GetSourceType() != CDVD_SourceType::NoDisc) if (CDVDsys_GetSourceType() != CDVD_SourceType::NoDisc)
{ {
DevCon.WriteLn(Color_Green, "Media ready to read"); DevCon.WriteLn(Color_Green, "Media ready to use");
cdvdUpdateStatus(CDVD_STATUS_PAUSE);
}
else
{
cdvd.Spinning = false;
cdvdUpdateStatus(CDVD_STATUS_STOP);
} }
break; break;
} }