MdeModulePkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / MdeModulePkg / Bus / Ata / AtaAtapiPassThru / IdeMode.c

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index d284cc600b6ae28570662e3f740bb6fd3bf4cf5d..9a6d0e60e42ca58dd1b4d6737ccab065a80e965d 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -252,36 +252,36 @@ DumpAllIdeRegisters (
 \r
   DEBUG_CODE_BEGIN ();\r
   if ((StatusBlock.AtaStatus & ATA_STSREG_DWF) != 0) {\r
-    DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Write Fault\n", StatusBlock.AtaStatus));\r
+    DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Write Fault\n", StatusBlock.AtaStatus));\r
   }\r
 \r
   if ((StatusBlock.AtaStatus & ATA_STSREG_CORR) != 0) {\r
-    DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Corrected Data\n", StatusBlock.AtaStatus));\r
+    DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Corrected Data\n", StatusBlock.AtaStatus));\r
   }\r
 \r
   if ((StatusBlock.AtaStatus & ATA_STSREG_ERR) != 0) {\r
     if ((StatusBlock.AtaError & ATA_ERRREG_BBK) != 0) {\r
-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Bad Block Detected\n", StatusBlock.AtaError));\r
+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Bad Block Detected\n", StatusBlock.AtaError));\r
     }\r
 \r
     if ((StatusBlock.AtaError & ATA_ERRREG_UNC) != 0) {\r
-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Uncorrectable Data\n", StatusBlock.AtaError));\r
+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Uncorrectable Data\n", StatusBlock.AtaError));\r
     }\r
 \r
     if ((StatusBlock.AtaError & ATA_ERRREG_MC) != 0) {\r
-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Media Change\n", StatusBlock.AtaError));\r
+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Media Change\n", StatusBlock.AtaError));\r
     }\r
 \r
     if ((StatusBlock.AtaError & ATA_ERRREG_ABRT) != 0) {\r
-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Abort\n", StatusBlock.AtaError));\r
+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Abort\n", StatusBlock.AtaError));\r
     }\r
 \r
     if ((StatusBlock.AtaError & ATA_ERRREG_TK0NF) != 0) {\r
-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Track 0 Not Found\n", StatusBlock.AtaError));\r
+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Track 0 Not Found\n", StatusBlock.AtaError));\r
     }\r
 \r
     if ((StatusBlock.AtaError & ATA_ERRREG_AMNF) != 0) {\r
-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Address Mark Not Found\n", StatusBlock.AtaError));\r
+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Address Mark Not Found\n", StatusBlock.AtaError));\r
     }\r
   }\r
   DEBUG_CODE_END ();\r
@@ -1162,7 +1162,7 @@ AtaUdmStatusWait (
     IoPortForBmis = (UINT16) (IdeRegisters->BusMasterBaseAddr + BMIS_OFFSET);\r
     RegisterValue = IdeReadPortB (PciIo, IoPortForBmis);\r
     if (((RegisterValue & BMIS_ERROR) != 0) || (Timeout == 0)) {\r
-      DEBUG ((EFI_D_ERROR, "ATA UDMA operation fails\n"));\r
+      DEBUG ((DEBUG_ERROR, "ATA UDMA operation fails\n"));\r
       Status = EFI_DEVICE_ERROR;\r
       break;\r
     }\r
@@ -1217,7 +1217,7 @@ AtaUdmStatusCheck (
   RegisterValue = IdeReadPortB (PciIo, IoPortForBmis);\r
 \r
   if ((RegisterValue & BMIS_ERROR) != 0) {\r
-    DEBUG ((EFI_D_ERROR, "ATA UDMA operation fails\n"));\r
+    DEBUG ((DEBUG_ERROR, "ATA UDMA operation fails\n"));\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -2077,7 +2077,7 @@ IdeAtaSmartReturnStatusCheck (
     //\r
     // The threshold exceeded condition is not detected by the device\r
     //\r
-    DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));\r
+    DEBUG ((DEBUG_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));\r
     REPORT_STATUS_CODE (\r
           EFI_PROGRESS_CODE,\r
           (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD)\r
@@ -2086,7 +2086,7 @@ IdeAtaSmartReturnStatusCheck (
     //\r
     // The threshold exceeded condition is detected by the device\r
     //\r
-    DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));\r
+    DEBUG ((DEBUG_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));\r
     REPORT_STATUS_CODE (\r
          EFI_PROGRESS_CODE,\r
          (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD)\r
@@ -2126,7 +2126,7 @@ IdeAtaSmartSupport (
     //\r
     // S.M.A.R.T is not supported by the device\r
     //\r
-    DEBUG ((EFI_D_INFO, "S.M.A.R.T feature is not supported at [%a] channel [%a] device!\n",\r
+    DEBUG ((DEBUG_INFO, "S.M.A.R.T feature is not supported at [%a] channel [%a] device!\n",\r
             (Channel == 1) ? "secondary" : "primary", (Device == 1) ? "slave" : "master"));\r
     REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
@@ -2195,7 +2195,7 @@ IdeAtaSmartSupport (
       }\r
     }\r
 \r
-    DEBUG ((EFI_D_INFO, "Enabled S.M.A.R.T feature at [%a] channel [%a] device!\n",\r
+    DEBUG ((DEBUG_INFO, "Enabled S.M.A.R.T feature at [%a] channel [%a] device!\n",\r
            (Channel == 1) ? "secondary" : "primary", (Device == 1) ? "slave" : "master"));\r
 \r
   }\r
@@ -2392,7 +2392,7 @@ DetectAndConfigIdeDevice (
 \r
     Status = WaitForBSYClear (PciIo, IdeRegisters, 350000000);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG((EFI_D_ERROR, "New detecting method: Send Execute Diagnostic Command: WaitForBSYClear: Status: %d\n", Status));\r
+      DEBUG((DEBUG_ERROR, "New detecting method: Send Execute Diagnostic Command: WaitForBSYClear: Status: %d\n", Status));\r
       continue;\r
     }\r
 \r
@@ -2453,7 +2453,7 @@ DetectAndConfigIdeDevice (
       continue;\r
     }\r
 \r
-    DEBUG ((EFI_D_INFO, "[%a] channel [%a] [%a] device\n",\r
+    DEBUG ((DEBUG_INFO, "[%a] channel [%a] [%a] device\n",\r
             (IdeChannel == 1) ? "secondary" : "primary  ", (IdeDevice == 1) ? "slave " : "master",\r
             DeviceType == EfiIdeCdrom ? "cdrom   " : "harddisk"));\r
     //\r
@@ -2484,7 +2484,7 @@ DetectAndConfigIdeDevice (
                         &SupportedModes\r
                         );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Calculate Mode Fail, Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "Calculate Mode Fail, Status = %r\n", Status));\r
       continue;\r
     }\r
 \r
@@ -2503,7 +2503,7 @@ DetectAndConfigIdeDevice (
       Status = SetDeviceTransferMode (Instance, IdeChannel, IdeDevice, &TransferMode, NULL);\r
 \r
       if (EFI_ERROR (Status)) {\r
-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));\r
+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));\r
         continue;\r
       }\r
     }\r
@@ -2520,7 +2520,7 @@ DetectAndConfigIdeDevice (
       Status = SetDeviceTransferMode (Instance, IdeChannel, IdeDevice, &TransferMode, NULL);\r
 \r
       if (EFI_ERROR (Status)) {\r
-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));\r
+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));\r
         continue;\r
       }\r
     } else if (SupportedModes->MultiWordDmaMode.Valid) {\r
@@ -2529,7 +2529,7 @@ DetectAndConfigIdeDevice (
       Status = SetDeviceTransferMode (Instance, IdeChannel, IdeDevice, &TransferMode, NULL);\r
 \r
       if (EFI_ERROR (Status)) {\r
-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));\r
+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));\r
         continue;\r
       }\r
     }\r
@@ -2619,7 +2619,7 @@ IdeModeInitialization (
                         &MaxDevices\r
                         );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "[GetChannel, Status=%x]", Status));\r
+      DEBUG ((DEBUG_ERROR, "[GetChannel, Status=%x]", Status));\r
       continue;\r
     }\r
 \r
@@ -2658,4 +2658,3 @@ IdeModeInitialization (
 ErrorExit:\r
   return Status;\r
 }\r
-\r