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

Fixed some compile-breaking errors.

Browse Source
This commit is contained in:
OBattler
2017-01-17 00:04:49 +01:00
parent 7e54cc4436
commit 082c4e9ff8
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cdrom.c
View File

@@ -2846,7 +2846,7 @@ void cdrom_write(uint8_t channel, uint8_t val)
if (id > CDROM_NUM) if (id > CDROM_NUM)
{ {
return 0; return;
} }
cdbufferb = (uint8_t *) cdrom[id].buffer; cdbufferb = (uint8_t *) cdrom[id].buffer;
@@ -2871,6 +2871,6 @@ void cdrom_write(uint8_t channel, uint8_t val)
cdrom_phase_callback(id); cdrom_phase_callback(id);
timer_update_outstanding(); timer_update_outstanding();
} }
return 0; return;
} }
} }

2
src/cdrom.h
View File

@@ -190,7 +190,7 @@ int cdrom_atapi_phase_to_scsi(uint8_t id);
void cdrom_command(uint8_t id, uint8_t *cdb); void cdrom_command(uint8_t id, uint8_t *cdb);
int cdrom_phase_callback(uint8_t id); int cdrom_phase_callback(uint8_t id);
uint8_t cdrom_read(uint8_t channel); 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); int cdrom_lba_to_msf_accurate(int lba);
void cdrom_reset(uint8_t id); void cdrom_reset(uint8_t id);
void cdrom_set_signature(int id); void cdrom_set_signature(int id);

5
src/ide.c
View File

@@ -751,10 +751,7 @@ void ide_write_data(int ide_board, uint8_t val)
return; return;
} }
if (cdrom_write(cur_ide[ide_board], val)) cdrom_write(cur_ide[ide_board], val);
{
ide_irq_raise(ide);
}
if (cdrom[atapi_cdrom_drives[cur_ide[ide_board]]].callback) if (cdrom[atapi_cdrom_drives[cur_ide[ide_board]]].callback)
{ {