claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed reading of Mode 2 data from images.

Browse Source
This commit is contained in:
OBattler
2017-06-14 05:17:13 +02:00
parent eb8b8e3766
commit 9f922ecc2e
2 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cdrom.c
View File

@@ -1856,7 +1856,7 @@ int cdrom_read_blocks(uint8_t id, uint32_t *len, int first_batch)
} }
else else
{ {
type = 2; type = 8;
flags = 0x10; flags = 0x10;
} }

49
src/cdrom_image.cc
View File

@@ -447,7 +447,7 @@ static int image_readsector_raw(uint8_t id, uint8_t *buffer, int sector, int ism
if (cdrom_image[id].image_is_iso) if (cdrom_image[id].image_is_iso)
{ {
audio = 0; audio = 0;
mode2 = 0; mode2 = cdimg[id]->IsMode2(real_pos) ? 1 : 0;
} }
else else
{ {
@@ -464,7 +464,7 @@ static int image_readsector_raw(uint8_t id, uint8_t *buffer, int sector, int ism
return 0; return 0;
} }
if ((cdrom_sector_type == 3) || (cdrom_sector_type > 4)) if ((cdrom_sector_type == 3) || ((cdrom_sector_type > 4) && (cdrom_sector_type != 8)))
{ {
if (cdrom_sector_type == 3) if (cdrom_sector_type == 3)
{ {
@@ -589,7 +589,7 @@ read_mode1:
} }
else if (cdrom_sector_type == 4) else if (cdrom_sector_type == 4)
{ {
if (audio || !mode2 || cdrom_image[id].image_is_iso) if (audio || !mode2)
{ {
cdrom_image_log("CD-ROM %i: [XA Mode 2 Form 1] Attempting to read a non-XA Mode 2 Form 1 sector from an audio track\n", id); cdrom_image_log("CD-ROM %i: [XA Mode 2 Form 1] Attempting to read a non-XA Mode 2 Form 1 sector from an audio track\n", id);
return 0; return 0;
@@ -626,7 +626,31 @@ read_mode2:
return 0; return 0;
} }
cdimg[id]->ReadSector(cdrom_sector_buffer.buffer, true, real_pos); if (cdrom_image[id].image_is_iso)
{
cdimg[id]->ReadSector(raw_buffer + 24, false, real_pos);
uint8_t *bb = raw_buffer;
/* sync bytes */
bb[0] = 0;
memset(bb + 1, 0xff, 10);
bb[11] = 0;
bb += 12;
bb[0] = (real_pos >> 16) & 0xff;
bb[1] = (real_pos >> 8) & 0xff;
bb[2] = real_pos & 0xff;
bb[3] = 1; /* mode 1 data */
bb += 12;
bb += 2048;
memset(bb, 0, 280);
}
else
{
cdimg[id]->ReadSector(raw_buffer, true, real_pos);
}
cdrom_sector_size = 0; cdrom_sector_size = 0;
@@ -671,6 +695,23 @@ read_mode2:
temp_b += 280; temp_b += 280;
} }
} }
else if (cdrom_sector_type == 8)
{
if (audio)
{
cdrom_image_log("CD-ROM %i: [Any Data] Attempting to read a data sector from an audio track\n", id);
return 0;
}
if (mode2)
{
goto read_mode2;
}
else
{
goto read_mode1;
}
}
else else
{ {
if (mode2) if (mode2)