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

The error code in cdrom.c now logs errors;

Browse Source 
Illegal LUN is now invalid LUN and 05/25/00.
This commit is contained in:
OBattler
2017-01-21 01:17:49 +01:00
parent b2c7b4665d
commit 2e15aca382
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cdrom.c
View File

@@ -929,6 +929,7 @@ static void cdrom_cmd_error(uint8_t id)
cdrom[id].phase = 3; cdrom[id].phase = 3;
cdrom[id].packet_status = 0x80; cdrom[id].packet_status = 0x80;
cdrom[id].callback = 50 * CDROM_TIME; cdrom[id].callback = 50 * CDROM_TIME;
cdrom_log("CD-ROM %i: ERROR: %02X/%02X/%02X\n", id cdrom_sense_key, cdrom_asc, cdrom_ascq);
} }
static void cdrom_unit_attention(uint8_t id) static void cdrom_unit_attention(uint8_t id)
@@ -942,6 +943,7 @@ static void cdrom_unit_attention(uint8_t id)
cdrom[id].phase = 3; cdrom[id].phase = 3;
cdrom[id].packet_status = 0x80; cdrom[id].packet_status = 0x80;
cdrom[id].callback = 50 * CDROM_TIME; cdrom[id].callback = 50 * CDROM_TIME;
cdrom_log("CD-ROM %i: UNIT ATTENTION\n", id);
} }
static void cdrom_not_ready(uint8_t id) static void cdrom_not_ready(uint8_t id)
@@ -952,11 +954,10 @@ static void cdrom_not_ready(uint8_t id)
cdrom_cmd_error(id); cdrom_cmd_error(id);
} }
/* This is 05/00/00, based on what a Daemon Tools drive returns for such a case. */ static void cdrom_invalid_lun(uint8_t id)
static void cdrom_illegal_lun(uint8_t id)
{ {
cdrom_sense_key = SENSE_ILLEGAL_REQUEST; cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
cdrom_asc = 0; cdrom_asc = ASC_INV_LUN;
cdrom_ascq = 0; cdrom_ascq = 0;
cdrom_cmd_error(id); cdrom_cmd_error(id);
} }
@@ -1427,7 +1428,7 @@ int cdrom_pre_execution_check(uint8_t id, uint8_t *cdb)
if (((cdrom[id].request_length >> 5) & 7) != cdrom_drives[id].scsi_device_lun) if (((cdrom[id].request_length >> 5) & 7) != cdrom_drives[id].scsi_device_lun)
{ {
cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", id, ((cdrom[id].request_length >> 5) & 7)); cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", id, ((cdrom[id].request_length >> 5) & 7));
cdrom_illegal_lun(id); cdrom_invalid_lun(id);
return 0; return 0;
} }
} }

1
src/scsi.h
View File

@@ -78,6 +78,7 @@
#define ASC_ILLEGAL_OPCODE 0x20 #define ASC_ILLEGAL_OPCODE 0x20
#define ASC_LBA_OUT_OF_RANGE 0x21 #define ASC_LBA_OUT_OF_RANGE 0x21
#define ASC_INV_FIELD_IN_CMD_PACKET 0x24 #define ASC_INV_FIELD_IN_CMD_PACKET 0x24
#define ASC_INV_LUN 0x25
#define ASC_INV_FIELD_IN_PARAMETER_LIST 0x26 #define ASC_INV_FIELD_IN_PARAMETER_LIST 0x26
#define ASC_MEDIUM_MAY_HAVE_CHANGED 0x28 #define ASC_MEDIUM_MAY_HAVE_CHANGED 0x28
#define ASC_INCOMPATIBLE_FORMAT 0x30 #define ASC_INCOMPATIBLE_FORMAT 0x30