Modified ATAPI and SCSI disc change handling.

src/buslogic.c

@@ -1374,27 +1374,51 @@ static void BuslogicSCSIRequestSetup(Buslogic_t *Buslogic, uint32_t CCBPointer,
 			
 			BuslogicDataBufferAllocate(BuslogicRequests, &BuslogicRequests->CmdBlock, BuslogicRequests->Is24bit);
 
+			uint8_t SenseLength = BuslogicConvertSenseLength(BuslogicRequests->CmdBlock.common.RequestSenseLength);
+		
+			if ((CmdBlock.common.ControlByte != 0x03) && (CmdBlock.common.Opcode == SCSI_INITIATOR_COMMAND))
+			{
+				if (cdrom->medium_changed())
+				{
+					pclog("Media changed\n");
+					SCSICDROM_Insert();
+				}
+
+				if (!cdrom->ready() && SCSISense.UnitAttention)
+				{
+					/* If the drive is not ready, there is no reason to keep the
+					   UNIT ATTENTION condition present, as we only use it to mark
+					   disc changes. */
+					SCSISense.UnitAttention = 0;
+				}
+	
 				/* If the UNIT ATTENTION condition is set and the command does not allow
 				   execution under it, error out and report the condition. */
-			if (!(SCSICommandTable[BuslogicRequests->CmdBlock.common.Cdb[0]] & ALLOW_UA) && SCSISense.UnitAttention)
+				if (SCSISense.UnitAttention == 1)
+				{
+					SCSISense.UnitAttention = 2;
+					if (!(SCSICommandTable[BuslogicRequests->CmdBlock.common.Cdb[0]] & ALLOW_UA))
 					{
 						SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
 						SCSIStatus = SCSI_STATUS_CHECK_CONDITION;
 						SCSICallback[Id]=50*SCSI_TIME;
+						BuslogicMailboxIn(Buslogic, BuslogicRequests->CCBPointer, &BuslogicRequests->CmdBlock, CCB_COMPLETE, SCSI_STATUS_CHECK_CONDITION, MBI_ERROR);
+						return;
+					}
+				}
+				else if (SCSISense.UnitAttention == 2)
+				{
+					if (BuslogicRequests->CmdBlock.common.Cdb[0]!=GPCMD_REQUEST_SENSE)
+					{
+						SCSISense.UnitAttention = 0;
+					}
 				}
 			
 				/* Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
 				   clear the UNIT ATTENTION condition if it's set. */
 				if (BuslogicRequests->CmdBlock.common.Cdb[0]!=GPCMD_REQUEST_SENSE)
 				{
-				if (SCSISense.UnitAttention)
-				{
-					SCSISense.UnitAttention = 0;
 					SCSIClearSense(BuslogicRequests->CmdBlock.common.Cdb[0], 0);
-					SCSIStatus = SCSI_STATUS_OK;
-					BuslogicMailboxIn(Buslogic, BuslogicRequests->CCBPointer, &BuslogicRequests->CmdBlock, CCB_COMPLETE, SCSI_STATUS_OK,
-							MBI_SUCCESS);
-				}
 				}
 
 				/* Next it's time for NOT READY. */
@@ -1404,12 +1428,10 @@ static void BuslogicSCSIRequestSetup(Buslogic_t *Buslogic, uint32_t CCBPointer,
 					SCSISenseCodeError(SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT, 0);
 					SCSIStatus = SCSI_STATUS_CHECK_CONDITION;
 					SCSICallback[Id]=50*SCSI_TIME;
-				BuslogicMailboxIn(Buslogic, BuslogicRequests->CCBPointer, &BuslogicRequests->CmdBlock, CCB_COMPLETE, SCSI_STATUS_CHECK_CONDITION,
+					BuslogicMailboxIn(Buslogic, BuslogicRequests->CCBPointer, &BuslogicRequests->CmdBlock, CCB_COMPLETE, SCSI_STATUS_CHECK_CONDITION, MBI_ERROR);
-										MBI_ERROR);
 					return;
 				}
-		
+			}
-			uint8_t SenseLength = BuslogicConvertSenseLength(BuslogicRequests->CmdBlock.common.RequestSenseLength);
 				
 			uint32_t i;
 			

src/cdrom-ioctl.c

@@ -303,7 +303,14 @@ static int ioctl_medium_changed(void)
                 if (cdrom_drive != old_cdrom_drive)
                         old_cdrom_drive = cdrom_drive;
 				cdrom_capacity = ioctl_get_last_block(0, 0, 4096, 0);
+				if (cdrom_drive == old_cdrom_drive)
+				{
 					return 1;
+				}
+				else
+				{
+					return 0;
+				}
         }
 		else
 		{

src/ide.c

@@ -1771,7 +1771,7 @@ static void atapi_invalid_field(IDE *ide)
 static void atapi_illegal_mode(IDE *ide)
 {
 	SCSISense.SenseKey = SENSE_ILLEGAL_REQUEST;
-	SCSISense.Asc = ASC_ILLEGAL_OPCODE;
+	SCSISense.Asc = ASC_ILLEGAL_MODE_FOR_THIS_TRACK;
 	SCSISense.Ascq = 0;
 	atapi_cmd_error(ide, SENSE_ILLEGAL_REQUEST, ASC_ILLEGAL_MODE_FOR_THIS_TRACK, 0);
 }
@@ -1779,7 +1779,7 @@ static void atapi_illegal_mode(IDE *ide)
 static void atapi_incompatible_format(IDE *ide)
 {
 	SCSISense.SenseKey = SENSE_ILLEGAL_REQUEST;
-	SCSISense.Asc = ASC_ILLEGAL_OPCODE;
+	SCSISense.Asc = ASC_INCOMPATIBLE_FORMAT;
 	SCSISense.Ascq = 0;
 	atapi_cmd_error(ide, SENSE_ILLEGAL_REQUEST, ASC_INCOMPATIBLE_FORMAT, 0);
 }
@@ -1787,7 +1787,7 @@ static void atapi_incompatible_format(IDE *ide)
 static void atapi_data_phase_error(IDE *ide)
 {
 	SCSISense.SenseKey = SENSE_ILLEGAL_REQUEST;
-	SCSISense.Asc = ASC_ILLEGAL_OPCODE;
+	SCSISense.Asc = ASC_DATA_PHASE_ERROR;
 	SCSISense.Ascq = 0;
 	atapi_cmd_error(ide, SENSE_ILLEGAL_REQUEST, ASC_DATA_PHASE_ERROR, 0);
 }
@@ -1848,17 +1848,23 @@ static void atapicommand(int ide_board)
 	
 	/* If the UNIT ATTENTION condition is set and the command does not allow
 		execution under it, error out and report the condition. */
-	if (!(SCSICommandTable[idebufferb[0]] & ALLOW_UA) && SCSISense.UnitAttention)
+	if (SCSISense.UnitAttention == 1)
+	{
+		SCSISense.UnitAttention = 2;
+		if (!(SCSICommandTable[idebufferb[0]] & ALLOW_UA))
 		{
 			// pclog("UNIT ATTENTION: Command not allowed to pass through\n");
 			atapi_cmd_error(ide, SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
 			return;
 		}
-
+	}
-	if (idebufferb[0] == GPCMD_READ_TOC_PMA_ATIP)
+	else if (SCSISense.UnitAttention == 2)
+	{
+		if (idebufferb[0]!=GPCMD_REQUEST_SENSE)
 		{
 			SCSISense.UnitAttention = 0;
 		}
+	}
 
 	/* Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
 		the UNIT ATTENTION condition if it's set. */

src/scsi_cdrom.c

@@ -34,7 +34,7 @@ uint8_t SCSICommandTable[0x100] =
 	[GPCMD_READ_10]                       = CHECK_READY,
 	[GPCMD_SEEK_10]                       = CHECK_READY | NONDATA,
 	[GPCMD_READ_SUBCHANNEL]               = CHECK_READY,
-	[GPCMD_READ_TOC_PMA_ATIP]             = CHECK_READY | ALLOW_UA,		/* Read TOC - can get through UNIT_ATTENTION, per VIDE-CDD.SYS
+	[GPCMD_READ_TOC_PMA_ATIP]             = CHECK_READY,			/* Read TOC - can get through UNIT_ATTENTION, per VIDE-CDD.SYS
 										   NOTE: The ATAPI reference says otherwise, but I think this is a question of
 										   interpreting things right - the UNIT ATTENTION condition we have here
 										   is a tradition from not ready to ready, by definition the drive
@@ -755,48 +755,6 @@ void SCSICDROM_Command(uint8_t id, uint8_t *cdb, uint8_t sense)
 
 	msf = cdb[1] & 2;
 
-	if (cdrom->medium_changed())
-	{
-		pclog("Media changed\n");
-		SCSICDROM_Insert();
-	}
-
-	if (!cdrom->ready() && SCSISense.UnitAttention)
-	{
-		/* If the drive is not ready, there is no reason to keep the
-			UNIT ATTENTION condition present, as we only use it to mark
-			disc changes. */
-		SCSISense.UnitAttention = 0;
-	}
-	
-	/* If the UNIT ATTENTION condition is set and the command does not allow
-		execution under it, error out and report the condition. */
-#if 0
-	if (!(SCSICommandTable[cdb[0]] & ALLOW_UA) && SCSISense.UnitAttention)
-	{
-		pclog("UNIT ATTENTION\n");
-		SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-		SCSIStatus = SCSI_STATUS_CHECK_CONDITION;
-		SCSICallback[id]=50*SCSI_TIME;
-		return;
-	}
-#endif
-	
-	if (cdb[0] == GPCMD_READ_TOC_PMA_ATIP)
-		SCSISense.UnitAttention = 0;
-
-#if 0
-	/* Next it's time for NOT READY. */
-	if ((SCSICommandTable[cdb[0]] & CHECK_READY) && !cdrom->ready())
-	{
-		pclog("Not ready\n");
-		SCSISenseCodeError(SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT, 0);
-		SCSIStatus = SCSI_STATUS_CHECK_CONDITION;
-		SCSICallback[id]=50*SCSI_TIME;
-		return;
-	}
-#endif
-
 	prev_status = cd_status;
 	cd_status = cdrom->status();
 	if (((prev_status == CD_STATUS_PLAYING) || (prev_status == CD_STATUS_PAUSED)) && ((cd_status != CD_STATUS_PLAYING) && (cd_status != CD_STATUS_PAUSED)))
@@ -845,7 +803,7 @@ void SCSICDROM_Command(uint8_t id, uint8_t *cdb, uint8_t sense)
 		{
 			pclog("Trying to read beyond the end of disc\n");
 			SCSIStatus = SCSI_STATUS_CHECK_CONDITION;
-			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE, 0);
+			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0);
 			SCSICallback[id]=50*SCSI_TIME;
 			break;
 		}
@@ -1047,7 +1005,7 @@ SCSIOut:
 		if (cdb[4]!=2 && cdb[4]!=3 && cdb[4])
 		{
 			SCSIStatus = SCSI_STATUS_CHECK_CONDITION;			
-			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE, 0x00);
+			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
 			SCSICallback[id]=50*SCSI_TIME;
 			break;
 		}
@@ -1095,7 +1053,7 @@ SCSIOut:
 		if (cdb[3] != 1)
 		{
 			SCSIStatus = SCSI_STATUS_CHECK_CONDITION;			
-			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE, 0x00);
+			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
 			SCSICallback[id]=50*SCSI_TIME;
 			break;
 		}
@@ -1141,10 +1099,6 @@ SCSIOut:
 			default:
 			SCSIStatus = SCSI_STATUS_CHECK_CONDITION;			
 			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
-			if (SCSISense.UnitAttention)
-			{
-				SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-			}
 			SCSICallback[id]=50*SCSI_TIME;
 			return;
 		}
@@ -1395,10 +1349,6 @@ SCSIOut:
 			{
 				SCSIStatus = SCSI_STATUS_CHECK_CONDITION;			
 				SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
-				if (SCSISense.UnitAttention)
-				{
-					SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-				}
 				SCSICallback[id]=50*SCSI_TIME;
 				return;		
 			}
@@ -1414,10 +1364,6 @@ SCSIOut:
 			{
 				SCSIStatus = SCSI_STATUS_CHECK_CONDITION;			
 				SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
-				if (SCSISense.UnitAttention)
-				{
-					SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-				}
 				SCSICallback[id]=50*SCSI_TIME;
 				return;		
 			}
@@ -1469,10 +1415,6 @@ SCSIOut:
 			{
 				SCSIStatus = SCSI_STATUS_CHECK_CONDITION;				
 				SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
-				if (SCSISense.UnitAttention)
-				{
-					SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-				}
 				SCSICallback[id]=50*SCSI_TIME;
 				return;
 			}
@@ -1515,10 +1457,6 @@ SCSIOut:
 			default:
 			SCSIStatus = SCSI_STATUS_CHECK_CONDITION;			
 			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
-			if (SCSISense.UnitAttention)
-			{
-				SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-			}
 			SCSICallback[id]=50*SCSI_TIME;
 			return;
 		}
@@ -1548,11 +1486,7 @@ SCSIOut:
 		{
 			//pclog("Trying to read beyond the end of disc\n");
 			SCSIStatus = SCSI_STATUS_CHECK_CONDITION;
-			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE, 0);
+			SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0);
-			if (SCSISense.UnitAttention)
-			{
-				SCSISenseCodeError(SENSE_UNIT_ATTENTION, ASC_MEDIUM_MAY_HAVE_CHANGED, 0);
-			}
 			SCSICallback[id]=50*SCSI_TIME;
 			break;
 		}		
@@ -1612,7 +1546,7 @@ void SCSICDROM_ReadData(uint8_t id, uint8_t *cdb, uint8_t *data, int datalen, ui
 			if (!read_length)
 			{
 				SCSIStatus = SCSI_STATUS_CHECK_CONDITION;				
-				SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE, 0x00);
+				SCSISenseCodeError(SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
 				SCSICallback[id]=50*SCSI_TIME;
 				break;
 			}