80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of github.com:86Box/86Box into tc1995

Browse Source
This commit is contained in:
TC1995
2022-01-10 23:17:24 +01:00
parent 1dc4b85f98 bf8227dd6c
commit 4551283257
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cdrom/cdrom.c
View File

@@ -737,8 +737,8 @@ cdrom_read_disc_info_toc(cdrom_t *dev, unsigned char *b, unsigned char track, in
static int
track_type_is_valid(uint8_t id, int type, int flags, int audio, int mode2)
{
if (!(flags & 0x70)) { /* 0x00/0x08/0x80/0x88 are illegal modes */
cdrom_log("CD-ROM %i: [Any Mode] 0x00/0x08/0x80/0x88 are illegal modes\n", id);
if (!(flags & 0x70) && (flags & 0xf8)) { /* 0x08/0x80/0x88 are illegal modes */
cdrom_log("CD-ROM %i: [Any Mode] 0x08/0x80/0x88 are illegal modes\n", id);
return 0;
}

12
src/scsi/scsi_cdrom.c
View File

@@ -1629,12 +1629,16 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
if ((cdb[9] & 0xf8) == 0x08) {
/* 0x08 is an illegal mode */
scsi_cdrom_invalid_field(dev);
break;
return;
}
/* If all the flag bits are cleared, then treat it as a non-data command. */
if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) == 0x00))
dev->sector_len = 0;
else if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) != 0x00)) {
scsi_cdrom_invalid_field(dev);
return;
}
break;
case GPCMD_READ_CD_OLD:
case GPCMD_READ_CD:
@@ -1647,12 +1651,16 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
if ((cdb[9] & 0xf8) == 0x08) {
/* 0x08 is an illegal mode */
scsi_cdrom_invalid_field(dev);
break;
return;
}
/* If all the flag bits are cleared, then treat it as a non-data command. */
if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) == 0x00))
dev->sector_len = 0;
else if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) != 0x00)) {
scsi_cdrom_invalid_field(dev);
return;
}
break;
}