libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-23 08:49:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "cdrom: respect disc cache setting for chd files"

Browse Source 
This reverts commit 0bb8b28179.
This commit is contained in:
Brian Koropoff 2017-10-01 12:35:01 -07:00
parent c6f4d0769e
commit e5cd40bdd1
2 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mednafen/cdrom/CDAccess_CHD.cpp
View File

@ -58,12 +58,8 @@ bool CDAccess_CHD::ImageOpen(const char *path, bool image_memcache)
/* allocate storage for sector reads */
const chd_header *head = chd_get_header(chd);
memcache = image_memcache;
hunkmem = (uint8_t*)malloc(head->hunkbytes);
oldhunk = -1;
if (memcache)
hunkmem = (uint8_t*)malloc(head->hunkbytes * head->hunkcount);
else
hunkmem = (uint8_t*)malloc(head->hunkbytes);
log_cb(RETRO_LOG_INFO, "chd_load '%s' hunkbytes=%d\n", path, head->hunkbytes);
@ -194,16 +190,6 @@ bool CDAccess_CHD::ImageOpen(const char *path, bool image_memcache)
}
sbi_path = MDFN_EvalFIP(base_dir, file_base + std::string(".") + std::string(sbi_ext), true);
if (memcache)
{
for (int i = 0; i < head->hunkcount; ++i)
{
err = chd_read(chd, i, hunkmem + i * head->hunkbytes);
if (err)
return false;
}
}
return true;
}
@ -423,33 +409,27 @@ bool CDAccess_CHD::Read_Raw_Sector(uint8 *buf, int32 lba)
}
else
{
// read CHD hunk
const chd_header *head = chd_get_header(chd);
//int cad = (((lba - ct->LBA) * 2352) + ct->FileOffset) / 2352;
int cad = lba - ct->LBA + ct->FileOffset;
if (memcache)
{
memcpy(buf, hunkmem + cad * (2352 + 96), 2352);
}
else
{
// read CHD hunk
const chd_header *head = chd_get_header(chd);
//int cad = (((lba - ct->LBA) * 2352) + ct->FileOffset) / 2352;
int sph = head->hunkbytes / (2352 + 96);
int hunknum = cad / sph; //(cad * head->unitbytes) / head->hunkbytes;
int hunkofs = cad % sph; //(cad * head->unitbytes) % head->hunkbytes;
int err = CHDERR_NONE;
int sph = head->hunkbytes / (2352 + 96);
int hunknum = cad / sph; //(cad * head->unitbytes) / head->hunkbytes;
int hunkofs = cad % sph; //(cad * head->unitbytes) % head->hunkbytes;
int err = CHDERR_NONE;
/* each hunk holds ~8 sectors, optimize when reading contiguous sectors */
if (hunknum != oldhunk)
{
err = chd_read(chd, hunknum, hunkmem);
if (err != CHDERR_NONE)
log_cb(RETRO_LOG_ERROR, "chd_read_sector failed lba=%d error=%d\n", lba, err);
else
oldhunk = hunknum;
}
memcpy(buf, hunkmem + hunkofs * (2352 + 96), 2352);
/* each hunk holds ~8 sectors, optimize when reading contiguous sectors */
if (hunknum != oldhunk)
{
err = chd_read(chd, hunknum, hunkmem);
if (err != CHDERR_NONE)
log_cb(RETRO_LOG_ERROR, "chd_read_sector failed lba=%d error=%d\n", lba, err);
else
oldhunk = hunknum;
}
memcpy(buf, hunkmem + hunkofs * (2352 + 96), 2352);
if (ct->DIFormat == DI_FORMAT_AUDIO && ct->RawAudioMSBFirst)
Endian_A16_Swap(buf, 588 * 2);
}

2
mednafen/cdrom/CDAccess_CHD.h
View File

@ -23,8 +23,6 @@ class CDAccess_CHD : public CDAccess
chd_file *chd;
/* hunk data cache */
uint8_t *hunkmem;
/* cached entire disc? */
bool memcache;
/* last hunknum read */
int oldhunk;