Status = CheckHostAdapterStatus (CommandPacket->HostAdapterStatus);\r
if (EFI_ERROR(Status)) {\r
DEBUG ((\r
- EFI_D_ERROR,\r
+ DEBUG_ERROR,\r
"ScsiDiskAsyncUnmapNotify: Host adapter indicating error status 0x%x.\n",\r
CommandPacket->HostAdapterStatus\r
));\r
Status = CheckTargetStatus (CommandPacket->TargetStatus);\r
if (EFI_ERROR(Status)) {\r
DEBUG ((\r
- EFI_D_ERROR,\r
+ DEBUG_ERROR,\r
"ScsiDiskAsyncUnmapNotify: Target indicating error status 0x%x.\n",\r
CommandPacket->HostAdapterStatus\r
));\r
Status = CheckHostAdapterStatus (CommandPacket->HostAdapterStatus);\r
if (EFI_ERROR(Status)) {\r
DEBUG ((\r
- EFI_D_ERROR,\r
+ DEBUG_ERROR,\r
"ScsiDiskUnmap: Host adapter indicating error status 0x%x.\n",\r
CommandPacket->HostAdapterStatus\r
));\r
Status = CheckTargetStatus (CommandPacket->TargetStatus);\r
if (EFI_ERROR(Status)) {\r
DEBUG ((\r
- EFI_D_ERROR,\r
+ DEBUG_ERROR,\r
"ScsiDiskUnmap: Target indicating error status 0x%x.\n",\r
CommandPacket->HostAdapterStatus\r
));\r
// Sanity checks for coping with broken devices\r
//\r
if (PageLength > sizeof SupportedVpdPages->SupportedVpdPageList) {\r
- DEBUG ((EFI_D_WARN,\r
+ DEBUG ((DEBUG_WARN,\r
"%a: invalid PageLength (%u) in Supported VPD Pages page\n",\r
__FUNCTION__, (UINT32)PageLength));\r
PageLength = 0;\r
if ((PageLength > 0) &&\r
(SupportedVpdPages->SupportedVpdPageList[0] !=\r
EFI_SCSI_PAGE_CODE_SUPPORTED_VPD)) {\r
- DEBUG ((EFI_D_WARN,\r
+ DEBUG ((DEBUG_WARN,\r
"%a: Supported VPD Pages page doesn't start with code 0x%02x\n",\r
__FUNCTION__, EFI_SCSI_PAGE_CODE_SUPPORTED_VPD));\r
PageLength = 0;\r
if ((Index > 0) &&\r
(SupportedVpdPages->SupportedVpdPageList[Index] <=\r
SupportedVpdPages->SupportedVpdPageList[Index - 1])) {\r
- DEBUG ((EFI_D_WARN,\r
+ DEBUG ((DEBUG_WARN,\r
"%a: non-ascending code in Supported VPD Pages page @ %u\n",\r
__FUNCTION__, Index));\r
Index = 0;\r
ScsiDiskDevice->BlkIo.Media->MediaPresent = FALSE;\r
ScsiDiskDevice->BlkIo.Media->LastBlock = 0;\r
*Action = ACTION_NO_ACTION;\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsNoMedia\n"));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsNoMedia\n"));\r
return EFI_SUCCESS;\r
}\r
\r
if (ScsiDiskIsMediaChange (SenseData, NumberOfSenseKeys)) {\r
ScsiDiskDevice->BlkIo.Media->MediaId++;\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsMediaChange!\n"));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsMediaChange!\n"));\r
return EFI_SUCCESS;\r
}\r
\r
if (ScsiDiskIsResetBefore (SenseData, NumberOfSenseKeys)) {\r
*Action = ACTION_RETRY_COMMAND_LATER;\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsResetBefore!\n"));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsResetBefore!\n"));\r
return EFI_SUCCESS;\r
}\r
\r
if (ScsiDiskIsMediaError (SenseData, NumberOfSenseKeys)) {\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsMediaError\n"));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsMediaError\n"));\r
*Action = ACTION_RETRY_WITH_BACKOFF_ALGO;\r
return EFI_DEVICE_ERROR;\r
}\r
\r
if (ScsiDiskIsHardwareError (SenseData, NumberOfSenseKeys)) {\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsHardwareError\n"));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsHardwareError\n"));\r
*Action = ACTION_RETRY_WITH_BACKOFF_ALGO;\r
return EFI_DEVICE_ERROR;\r
}\r
if (!ScsiDiskIsDriveReady (SenseData, NumberOfSenseKeys, &RetryLater)) {\r
if (RetryLater) {\r
*Action = ACTION_RETRY_COMMAND_LATER;\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskDriveNotReady!\n"));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskDriveNotReady!\n"));\r
return EFI_SUCCESS;\r
}\r
*Action = ACTION_NO_ACTION;\r
}\r
\r
*Action = ACTION_RETRY_WITH_BACKOFF_ALGO;\r
- DEBUG ((EFI_D_VERBOSE, "ScsiDisk: Sense Key = 0x%x ASC = 0x%x!\n", SenseData->Sense_Key, SenseData->Addnl_Sense_Code));\r
+ DEBUG ((DEBUG_VERBOSE, "ScsiDisk: Sense Key = 0x%x ASC = 0x%x!\n", SenseData->Sense_Key, SenseData->Addnl_Sense_Code));\r
return EFI_SUCCESS;\r
}\r
\r
}\r
\r
if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
- DEBUG ((EFI_D_ERROR, "ScsiDiskRead10: Check Condition happened!\n"));\r
+ DEBUG ((DEBUG_ERROR, "ScsiDiskRead10: Check Condition happened!\n"));\r
Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
if (Action == ACTION_RETRY_COMMAND_LATER) {\r
*NeedRetry = TRUE;\r
}\r
\r
if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
- DEBUG ((EFI_D_ERROR, "ScsiDiskWrite10: Check Condition happened!\n"));\r
+ DEBUG ((DEBUG_ERROR, "ScsiDiskWrite10: Check Condition happened!\n"));\r
Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
if (Action == ACTION_RETRY_COMMAND_LATER) {\r
*NeedRetry = TRUE;\r
}\r
\r
if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
- DEBUG ((EFI_D_ERROR, "ScsiDiskRead16: Check Condition happened!\n"));\r
+ DEBUG ((DEBUG_ERROR, "ScsiDiskRead16: Check Condition happened!\n"));\r
Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
if (Action == ACTION_RETRY_COMMAND_LATER) {\r
*NeedRetry = TRUE;\r
}\r
\r
if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
- DEBUG ((EFI_D_ERROR, "ScsiDiskWrite16: Check Condition happened!\n"));\r
+ DEBUG ((DEBUG_ERROR, "ScsiDiskWrite16: Check Condition happened!\n"));\r
Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
if (Action == ACTION_RETRY_COMMAND_LATER) {\r
*NeedRetry = TRUE;\r
}\r
\r
if (Request->TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) {\r
- DEBUG ((EFI_D_ERROR, "ScsiDiskNotify: Check Condition happened!\n"));\r
+ DEBUG ((DEBUG_ERROR, "ScsiDiskNotify: Check Condition happened!\n"));\r
\r
Status = DetectMediaParsingSenseKeys (\r
ScsiDiskDevice,\r
if (((CapacityData16->LowestAlignLogic2 & BIT7) == 0) ||\r
((CapacityData16->LowestAlignLogic2 & BIT6) == 0)) {\r
DEBUG ((\r
- EFI_D_VERBOSE,\r
+ DEBUG_VERBOSE,\r
"ScsiDisk EraseBlock: Either TPE or TPRZ is not set: 0x%x.\n",\r
CapacityData16->LowestAlignLogic2\r
));\r
}\r
} else {\r
DEBUG ((\r
- EFI_D_VERBOSE,\r
+ DEBUG_VERBOSE,\r
"ScsiDisk EraseBlock: ReadCapacity16 failed with status %r.\n",\r
CommandStatus\r
));\r
if ((ScsiDiskDevice->UnmapInfo.MaxLbaCnt == 0) ||\r
(ScsiDiskDevice->UnmapInfo.MaxBlkDespCnt == 0)) {\r
DEBUG ((\r
- EFI_D_VERBOSE,\r
+ DEBUG_VERBOSE,\r
"ScsiDisk EraseBlock: The device server does not implement the UNMAP command.\n"\r
));\r
\r