|
|
@@ -691,7 +691,7 @@ bool scsiInitiatorReadCapacity(int target_id, uint32_t *sectorcount, uint32_t *s
|
|
|
{
|
|
|
uint8_t sense_key;
|
|
|
scsiRequestSense(target_id, &sense_key);
|
|
|
- logmsg("READ CAPACITY on target ", target_id, " failed, sense key ", sense_key);
|
|
|
+ scsiLogInitiatorCommandFailure("READ CAPACITY", target_id, status, sense_key);
|
|
|
return false;
|
|
|
}
|
|
|
else
|
|
|
@@ -748,7 +748,7 @@ bool scsiStartStopUnit(int target_id, bool start)
|
|
|
{
|
|
|
uint8_t sense_key;
|
|
|
scsiRequestSense(target_id, &sense_key);
|
|
|
- dbgmsg("START STOP UNIT on target ", target_id, " failed, sense key ", sense_key);
|
|
|
+ scsiLogInitiatorCommandFailure("START STOP UNIT", target_id, status, sense_key);
|
|
|
}
|
|
|
|
|
|
return status == 0;
|
|
|
@@ -790,13 +790,13 @@ bool scsiTestUnitReady(int target_id)
|
|
|
uint8_t sense_key;
|
|
|
scsiRequestSense(target_id, &sense_key);
|
|
|
|
|
|
- if (sense_key == 6)
|
|
|
+ if (sense_key == UNIT_ATTENTION)
|
|
|
{
|
|
|
uint8_t inquiry[36];
|
|
|
dbgmsg("Target ", target_id, " reports UNIT_ATTENTION, running INQUIRY");
|
|
|
scsiInquiry(target_id, inquiry);
|
|
|
}
|
|
|
- else if (sense_key == 2)
|
|
|
+ else if (sense_key == NOT_READY)
|
|
|
{
|
|
|
dbgmsg("Target ", target_id, " reports NOT_READY, running STARTSTOPUNIT");
|
|
|
scsiStartStopUnit(target_id, true);
|
|
|
@@ -957,7 +957,7 @@ bool scsiInitiatorReadDataToFile(int target_id, uint32_t start_sector, uint32_t
|
|
|
uint8_t sense_key;
|
|
|
scsiRequestSense(target_id, &sense_key);
|
|
|
|
|
|
- logmsg("scsiInitiatorReadDataToFile: READ failed: ", status, " sense key ", sense_key);
|
|
|
+ scsiLogInitiatorCommandFailure("scsiInitiatorReadDataToFile command phase", target_id, status, sense_key);
|
|
|
scsiHostPhyRelease();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1055,7 +1055,7 @@ bool scsiInitiatorReadDataToFile(int target_id, uint32_t start_sector, uint32_t
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- logmsg("scsiInitiatorReadDataToFile: READ failed: ", status, " sense key ", sense_key);
|
|
|
+ scsiLogInitiatorCommandFailure("scsiInitiatorReadDataToFile data phase", target_id, status, sense_key);
|
|
|
return false;
|
|
|
}
|
|
|
}
|