izzy/PSX1
0
0
Fork 0
mirror of https://github.com/izzy2lost/PSX1.git synced 2026-07-05 15:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

cdrom-async: Fix subchannel read with hardware CD-ROM

Browse Source 
The common CD-ROM code expects cdra_readSub() to read the subchannel
data of a given sector without actually changing the current sector
whose buffer is returned by cdra_getBuffer().

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
This commit is contained in:
Paul Cercueil
2025-08-23 00:24:54 +03:00
committed by notaz
parent df21c2fa81
commit 9136290467
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libpcsxcore/cdrom-async.c
+3 -6
View File
@@ -163,9 +163,8 @@ static int lbacache_get(unsigned int lba, void *buf, void *sub_buf)
i = lba % acdrom.buf_cnt;
slock_lock(acdrom.buf_lock);
if (lba == acdrom.buf_cache[i].lba) {
if (!buf)
buf = acdrom.buf_local;
memcpy(buf, acdrom.buf_cache[i].buf, CD_FRAMESIZE_RAW);
if (buf)
memcpy(buf, acdrom.buf_cache[i].buf, CD_FRAMESIZE_RAW);
if (sub_buf)
memcpy(sub_buf, acdrom.buf_cache[i].buf_sub, SUB_FRAMESIZE);
ret = 1;
@@ -379,8 +378,6 @@ static int cdra_do_read(const unsigned char *time, int cdda,
}
}
acdrom.do_prefetch = 0;
if (!buf)
buf = acdrom.buf_local;
if (g_cd_handle) {
if (buf_sub)
ret = rcdrom_readSub(g_cd_handle, lba, buf_sub);
@@ -415,7 +412,7 @@ int cdra_readTrack(const unsigned char *time)
// just forward to ISOreadTrack to avoid extra copying
return ISOreadTrack(time, NULL);
}
return cdra_do_read(time, 0, NULL, NULL);
return cdra_do_read(time, 0, acdrom.buf_local, NULL);
}
int cdra_readCDDA(const unsigned char *time, void *buffer)