Skip to content

Commit abda039

Browse files
committed
Merge branch 'TC1995' into upd7220-code
2 parents 6ef4279 + 4e57e41 commit abda039

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/cdrom/cdrom.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,7 +2350,7 @@ cdrom_read_disc_info_toc(cdrom_t *dev, uint8_t *b,
23502350
b[1] = bin2bcd(trti[t].ps);
23512351
b[2] = bin2bcd(trti[t].pf);
23522352
b[3] = trti[t].adr_ctl;
2353-
2353+
23542354
cdrom_log(dev->log, "Returned Toshiba/NEC disc information (type 2) at "
23552355
"%02i:%02i.%02i, track=%d, attr=%02x.\n", b[0], b[1],
23562356
b[2], bcd2bin(track), b[3]);
@@ -3088,7 +3088,8 @@ cdrom_hard_reset(void)
30883088
const char *vendor = cdrom_drive_types[dev->type].vendor;
30893089

30903090
dev->is_early = cdrom_is_early(dev->type);
3091-
dev->is_bcd = !strcmp(vendor, "NEC");
3091+
dev->is_bcd = (dev->bus_type == CDROM_BUS_ATAPI) &&
3092+
!strcmp(vendor, "NEC");
30923093
dev->is_nec = (dev->bus_type == CDROM_BUS_SCSI) &&
30933094
!strcmp(vendor, "NEC");
30943095
dev->is_chinon = !strcmp(vendor, "CHINON");

0 commit comments

Comments
 (0)