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

CDVD: fix macOS CD reading

This commit is contained in:
Haruka 2022-12-19 03:52:36 +09:00 committed by lightningterror
parent 9a5dd4c19d
commit f04337becf
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/CDVD/Darwin/IOCtlSrc.cpp
View File

@ -99,10 +99,10 @@ bool IOCtlSrc::ReadSectors2048(u32 sector, u32 count, u8* buffer) const
if (bytes_read == -1) if (bytes_read == -1)
fprintf(stderr, " * CDVD read sectors %u-%u failed: %s\n", fprintf(stderr, " * CDVD read sectors %u-%u failed: %s\n",
sector, sector + count - 1, strerror(errno)); sector, sector + count - 1, strerror(errno));
else else
fprintf(stderr, " * CDVD read sectors %u-%u: %zd bytes read, %zd bytes expected\n", fprintf(stderr, " * CDVD read sectors %u-%u: %zd bytes read, %zd bytes expected\n",
sector, sector + count - 1, bytes_read, bytes_to_read); sector, sector + count - 1, bytes_read, bytes_to_read);
return false; return false;
} }
@ -111,8 +111,8 @@ bool IOCtlSrc::ReadSectors2352(u32 sector, u32 count, u8* buffer) const
#ifdef __APPLE__ #ifdef __APPLE__
dk_cd_read_t desc; dk_cd_read_t desc;
memset(&desc, 0, sizeof(dk_cd_read_t)); memset(&desc, 0, sizeof(dk_cd_read_t));
desc.sectorArea = kCDSectorAreaUser; desc.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaSubHeader | kCDSectorAreaUser | kCDSectorAreaAuxiliary;
desc.sectorType = kCDSectorTypeCDDA; desc.sectorType = kCDSectorTypeUnknown;
for (u32 i = 0; i < count; ++i) for (u32 i = 0; i < count; ++i)
{ {
desc.offset = (sector + i) * 2352ULL; desc.offset = (sector + i) * 2352ULL;
@ -120,8 +120,8 @@ bool IOCtlSrc::ReadSectors2352(u32 sector, u32 count, u8* buffer) const
desc.bufferLength = 2352; desc.bufferLength = 2352;
if (ioctl(m_device, DKIOCCDREAD, &desc) == -1) if (ioctl(m_device, DKIOCCDREAD, &desc) == -1)
{ {
fprintf(stderr, " * CDVD CDROMREADRAW sector %u failed: %s\n", fprintf(stderr, " * CDVD DKIOCCDREAD sector %u failed: %s\n",
sector + i, strerror(errno)); sector + i, strerror(errno));
return false; return false;
} }
} }
@ -220,7 +220,10 @@ bool IOCtlSrc::ReadCDInfo()
{ {
u32 lba = CDConvertMSFToLBA(desc.p); u32 lba = CDConvertMSFToLBA(desc.p);
m_toc.push_back({lba, desc.point, desc.adr, desc.control}); m_toc.push_back({lba, desc.point, desc.adr, desc.control});
m_sectors = lba; }
else if (desc.point == 0xa2) // lead out, use to get total sector count
{
m_sectors = CDConvertMSFToLBA(desc.p);
} }
} }