libretro/virtualjaguar-libretro
1
0 Fork 0
mirror of https://github.com/libretro/virtualjaguar-libretro.git synced 2026-11-07 12:47:58 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix(cd): Pause/Pause-Release complete with Found, not the error fallthrough

Browse Source 
Device-traced on Primal Rage: navigating to the CD-audio test sends
$0400 (Pause) / $0500 (Pause-Release), whose DS_DATA responses fell
through to the $0400 default -- the DSA ERROR response (butch.v response
table; the command table has no $04xx/$05xx completion of their own, and
the Philips CDD-family protocol completes both with Found $01).  The
game read "error" after every Unpause and re-Paused within a tick: CD
audio test silent, match start blocked behind the audio cue.

Queue $0100 (Found) at command time for both, alongside the existing
single-word response group.  cdPlaying side effects unchanged (pause
keeps position, FIFO already gates on cdPlaying).

Full suite green; 18/18 BUTCH contract tests.

Co-Authored-By: Claude Fable 5 <[email protected]>
This commit is contained in:
Joseph MattielloandClaude Fable 5 committed 2026-07-15 23:59:29 -04:00
1 parent c3368396ea
commit 0f22facd50
1 file changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/cd/cdrom.c
+11 -2
View File
@@ -1322,7 +1322,8 @@ void CDROMWriteWord(uint32_t offset, uint16_t data, uint32_t who/*=UNKNOWN*/)
// STOP response is queued below, don't set dsaResponseReady here
isMultiWordResponse = false;
}
else if ((data & 0xFF00) == 0x1500 || (data & 0xFF00) == 0x1800 ||
else if ((data & 0xFF00) == 0x0400 || (data & 0xFF00) == 0x0500 ||
(data & 0xFF00) == 0x1500 || (data & 0xFF00) == 0x1800 ||
(data & 0xFF00) == 0x5000 || (data & 0xFF00) == 0x5400 ||
(data & 0xFF00) == 0x7000)
{
@@ -1334,7 +1335,15 @@ void CDROMWriteWord(uint32_t offset, uint16_t data, uint32_t who/*=UNKNOWN*/)
* Mode) immediately followed by $150A (Set Mode) dropped the
* $70nn echo and the game wedged polling for it. */
uint16_t resp;
if ((data & 0xFF00) == 0x1500)
if ((data & 0xFF00) == 0x0400 || (data & 0xFF00) == 0x0500)
/* Pause / Pause-Release complete with Found ($01) in the
* Philips CDD-family DSA protocol (mister_ground_truth.h
* response table has no $04xx/$05xx completion; $04 is the
* ERROR response). Returning the old $0400 fallthrough made
* Primal Rage read "error" after Unpause and instantly
* re-Pause -- CD-audio test silent, match start blocked. */
resp = 0x0100;
else if ((data & 0xFF00) == 0x1500)
resp = 0x1700 | (data & 0xFF); /* Mode Status */
else if ((data & 0xFF00) == 0x1800)
resp = 0x0143; /* Spun Up */