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

Fixed ATAPI CD-ROM.

Browse Source
This commit is contained in:
OBattler
2017-10-16 17:33:01 +02:00
parent c225724b40
commit e10d751ca3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cdrom/cdrom.c
View File

@@ -3766,7 +3766,8 @@ void cdrom_phase_callback(uint8_t id)
case CDROM_PHASE_COMMAND: case CDROM_PHASE_COMMAND:
cdrom_log("CD-ROM %i: CDROM_PHASE_COMMAND\n", id); cdrom_log("CD-ROM %i: CDROM_PHASE_COMMAND\n", id);
cdrom[id].status = BUSY_STAT | (cdrom[id].status &ERR_STAT); cdrom[id].status = BUSY_STAT | (cdrom[id].status &ERR_STAT);
memcpy(cdrom[id].atapi_cdb, (uint8_t *) cdrom[id].buffer, cdrom[id].cdb_len); memcpy(cdrom[id].atapi_cdb, cdbufferb, cdrom[id].cdb_len);
cdrom_buf_free(id);
cdrom_command(id, cdrom[id].atapi_cdb); cdrom_command(id, cdrom[id].atapi_cdb);
return; return;
case CDROM_PHASE_COMPLETE: case CDROM_PHASE_COMPLETE:
@@ -3838,6 +3839,9 @@ uint32_t cdrom_read(uint8_t channel, int length)
cdbufferw = (uint16_t *) cdbufferb; cdbufferw = (uint16_t *) cdbufferb;
cdbufferl = (uint32_t *) cdbufferb; cdbufferl = (uint32_t *) cdbufferb;
if (!cdbufferb)
return 0;
switch(length) switch(length)
{ {
case 1: case 1:
@@ -3910,6 +3914,11 @@ void cdrom_write(uint8_t channel, uint32_t val, int length)
return; return;
} }
if (cdrom[id].packet_status == CDROM_PHASE_IDLE) {
if (!cdbufferb)
cdrom_buf_alloc(id, cdrom[id].cdb_len);
}
cdbufferw = (uint16_t *) cdbufferb; cdbufferw = (uint16_t *) cdbufferb;
cdbufferl = (uint32_t *) cdbufferb; cdbufferl = (uint32_t *) cdbufferb;
@@ -3949,7 +3958,6 @@ void cdrom_write(uint8_t channel, uint32_t val, int length)
cdrom[id].pos=0; cdrom[id].pos=0;
cdrom[id].status = BUSY_STAT; cdrom[id].status = BUSY_STAT;
cdrom[id].packet_status = CDROM_PHASE_COMMAND; cdrom[id].packet_status = CDROM_PHASE_COMMAND;
cdrom_buf_free(id);
timer_process(); timer_process();
cdrom_phase_callback(id); cdrom_phase_callback(id);
timer_update_outstanding(); timer_update_outstanding();