diff --git a/src/cdrom.c b/src/cdrom.c index 55b652e9e..bf5d7da7c 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -2846,7 +2846,7 @@ void cdrom_write(uint8_t channel, uint8_t val) if (id > CDROM_NUM) { - return 0; + return; } cdbufferb = (uint8_t *) cdrom[id].buffer; @@ -2871,6 +2871,6 @@ void cdrom_write(uint8_t channel, uint8_t val) cdrom_phase_callback(id); timer_update_outstanding(); } - return 0; + return; } } diff --git a/src/cdrom.h b/src/cdrom.h index 571b955d8..032e2978d 100644 --- a/src/cdrom.h +++ b/src/cdrom.h @@ -190,7 +190,7 @@ int cdrom_atapi_phase_to_scsi(uint8_t id); void cdrom_command(uint8_t id, uint8_t *cdb); int cdrom_phase_callback(uint8_t id); uint8_t cdrom_read(uint8_t channel); -int cdrom_write(uint8_t channel, uint8_t val); +void cdrom_write(uint8_t channel, uint8_t val); int cdrom_lba_to_msf_accurate(int lba); void cdrom_reset(uint8_t id); void cdrom_set_signature(int id); diff --git a/src/ide.c b/src/ide.c index 68c01684b..8484cec95 100644 --- a/src/ide.c +++ b/src/ide.c @@ -751,10 +751,7 @@ void ide_write_data(int ide_board, uint8_t val) return; } - if (cdrom_write(cur_ide[ide_board], val)) - { - ide_irq_raise(ide); - } + cdrom_write(cur_ide[ide_board], val); if (cdrom[atapi_cdrom_drives[cur_ide[ide_board]]].callback) {