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

Changed the IOCtl implementation of READ TRACK INFORMATION so that it returns if it succeded or failed, so the ATAPI and SCSI controllers can then act accordingly.

Browse Source
This commit is contained in:
OBattler
2016-12-25 17:52:17 +01:00
parent 4d71ebaf67
commit 92c44cb89f
5 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ide.c
View File

@@ -2563,7 +2563,17 @@ static void atapicommand(int ide_board)
if (cdrom->read_track_information)
{
cdrom->read_track_information(idebufferb, idebufferb);
ret = cdrom->read_track_information(idebufferb, idebufferb);
if (!ret)
{
ide->atastat = READY_STAT | ERR_STAT; /*CHECK CONDITION*/
ide->error = (SENSE_ILLEGAL_REQUEST << 4) | ABRT_ERR;
SCSISense.Asc = ASC_INV_FIELD_IN_CMD_PACKET;
ide->packetstatus = ATAPI_STATUS_ERROR;
idecallback[ide_board]=50*IDE_TIME;
return;
}
len = idebufferb[0];
len <<= 8;
@@ -2576,8 +2586,6 @@ static void atapicommand(int ide_board)
{
ide->atastat = READY_STAT | ERR_STAT; /*CHECK CONDITION*/
ide->error = (SENSE_ILLEGAL_REQUEST << 4) | ABRT_ERR;
/* if (SCSISense.SenseKey == SENSE_UNIT_ATTENTION)
ide->error |= MCR_ERR; */
SCSISense.Asc = ASC_INV_FIELD_IN_CMD_PACKET;
ide->packetstatus = ATAPI_STATUS_ERROR;
idecallback[ide_board]=50*IDE_TIME;