MdeModulePkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / MdeModulePkg / Bus / Scsi / ScsiDiskDxe / ScsiDisk.c

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index c80e78fa8a6b655f2da018b64b8429ec956c8517..b35d92fcd70eb7bb7af72c9b4cd003b1be8dc537 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1420,7 +1420,7 @@ ScsiDiskAsyncUnmapNotify (
   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
@@ -1432,7 +1432,7 @@ ScsiDiskAsyncUnmapNotify (
   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
@@ -1614,7 +1614,7 @@ ScsiDiskUnmap (
   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
@@ -1626,7 +1626,7 @@ ScsiDiskUnmap (
   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
@@ -2510,7 +2510,7 @@ ScsiDiskInquiryDevice (
         // 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
@@ -2519,7 +2519,7 @@ ScsiDiskInquiryDevice (
         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
@@ -2535,7 +2535,7 @@ ScsiDiskInquiryDevice (
           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
@@ -2861,30 +2861,30 @@ DetectMediaParsingSenseKeys (
     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
@@ -2892,7 +2892,7 @@ DetectMediaParsingSenseKeys (
   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
@@ -2900,7 +2900,7 @@ DetectMediaParsingSenseKeys (
   }\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
@@ -4206,7 +4206,7 @@ BackOff:
   }\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
@@ -4330,7 +4330,7 @@ BackOff:
   }\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
@@ -4453,7 +4453,7 @@ BackOff:
   }\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
@@ -4577,7 +4577,7 @@ BackOff:
   }\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
@@ -4686,7 +4686,7 @@ ScsiDiskNotify (
   }\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
@@ -5948,7 +5948,7 @@ DetermineInstallEraseBlock (
     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
@@ -5958,7 +5958,7 @@ DetermineInstallEraseBlock (
     }\r
   } else {\r
     DEBUG ((\r
-      EFI_D_VERBOSE,\r
+      DEBUG_VERBOSE,\r
       "ScsiDisk EraseBlock: ReadCapacity16 failed with status %r.\n",\r
       CommandStatus\r
       ));\r
@@ -5973,7 +5973,7 @@ DetermineInstallEraseBlock (
   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