MdeModulePkg: Change use of EFI_D_* to DEBUG_*

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

5 files changed, 49 insertions, 53 deletions

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index bda900a161..aec7d0cfbe 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -1723,7 +1723,7 @@ AhciAtaSmartReturnStatusCheck (
       //

       // The threshold exceeded condition is not detected by the device

       //

-      DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));

+      DEBUG ((DEBUG_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));

       REPORT_STATUS_CODE (

             EFI_PROGRESS_CODE,

             (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD)

@@ -1732,7 +1732,7 @@ AhciAtaSmartReturnStatusCheck (
       //

       // The threshold exceeded condition is detected by the device

       //

-      DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));

+      DEBUG ((DEBUG_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));

       REPORT_STATUS_CODE (

            EFI_PROGRESS_CODE,

            (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD)

@@ -1775,7 +1775,7 @@ AhciAtaSmartSupport (
     //

     // S.M.A.R.T is not supported by the device

     //

-    DEBUG ((EFI_D_INFO, "S.M.A.R.T feature is not supported at port [%d] PortMultiplier [%d]!\n",

+    DEBUG ((DEBUG_INFO, "S.M.A.R.T feature is not supported at port [%d] PortMultiplier [%d]!\n",

             Port, PortMultiplier));

     REPORT_STATUS_CODE (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

@@ -1851,7 +1851,7 @@ AhciAtaSmartSupport (
       AtaStatusBlock

       );

 

-    DEBUG ((EFI_D_INFO, "Enabled S.M.A.R.T feature at port [%d] PortMultiplier [%d]!\n",

+    DEBUG ((DEBUG_INFO, "Enabled S.M.A.R.T feature at port [%d] PortMultiplier [%d]!\n",

             Port, PortMultiplier));

   }

 

@@ -2785,7 +2785,7 @@ AhciModeInitialization (
                       NULL

                       );

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_WARN,

+      DEBUG ((DEBUG_WARN,

         "AhciModeInitialization: failed to enable 64-bit DMA on 64-bit capable controller (%r)\n",

         Status));

     }

@@ -2991,7 +2991,7 @@ AhciModeInitialization (
                           &SupportedModes

                           );

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Calculate Mode Fail, Status = %r\n", Status));

+        DEBUG ((DEBUG_ERROR, "Calculate Mode Fail, Status = %r\n", Status));

         continue;

       }

 

@@ -3022,7 +3022,7 @@ AhciModeInitialization (
 

       Status = AhciDeviceSetFeature (PciIo, AhciRegisters, Port, 0, 0x03, (UINT32)(*(UINT8 *)&TransferMode), ATA_ATAPI_TIMEOUT);

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

         continue;

       }

 

@@ -3061,4 +3061,3 @@ AhciModeInitialization (
 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 86fe9d954f..1c94b5f39d 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -682,7 +682,7 @@ AtaAtapiPassThruStart (
   Instance              = NULL;

   OriginalPciAttributes = 0;

 

-  DEBUG ((EFI_D_INFO, "==AtaAtapiPassThru Start== Controller = %x\n", Controller));

+  DEBUG ((DEBUG_INFO, "==AtaAtapiPassThru Start== Controller = %x\n", Controller));

 

   Status  = gBS->OpenProtocol (

                    Controller,

@@ -694,7 +694,7 @@ AtaAtapiPassThruStart (
                    );

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Open Ide_Controller_Init Error, Status=%r", Status));

+    DEBUG ((DEBUG_ERROR, "Open Ide_Controller_Init Error, Status=%r", Status));

     goto ErrorExit;

   }

 

@@ -707,7 +707,7 @@ AtaAtapiPassThruStart (
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

                   );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Get Pci_Io Protocol Error, Status=%r", Status));

+    DEBUG ((DEBUG_ERROR, "Get Pci_Io Protocol Error, Status=%r", Status));

     goto ErrorExit;

   }

 

@@ -872,7 +872,7 @@ AtaAtapiPassThruStop (
   EFI_PCI_IO_PROTOCOL               *PciIo;

   EFI_AHCI_REGISTERS                *AhciRegisters;

 

-  DEBUG ((EFI_D_INFO, "==AtaAtapiPassThru Stop== Controller = %x\n", Controller));

+  DEBUG ((DEBUG_INFO, "==AtaAtapiPassThru Stop== Controller = %x\n", Controller));

 

   Status = gBS->OpenProtocol (

                   Controller,

@@ -2646,4 +2646,3 @@ Exit:
 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index d284cc600b..9a6d0e60e4 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -252,36 +252,36 @@ DumpAllIdeRegisters (
 

   DEBUG_CODE_BEGIN ();

   if ((StatusBlock.AtaStatus & ATA_STSREG_DWF) != 0) {

-    DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Write Fault\n", StatusBlock.AtaStatus));

+    DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Write Fault\n", StatusBlock.AtaStatus));

   }

 

   if ((StatusBlock.AtaStatus & ATA_STSREG_CORR) != 0) {

-    DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Corrected Data\n", StatusBlock.AtaStatus));

+    DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Corrected Data\n", StatusBlock.AtaStatus));

   }

 

   if ((StatusBlock.AtaStatus & ATA_STSREG_ERR) != 0) {

     if ((StatusBlock.AtaError & ATA_ERRREG_BBK) != 0) {

-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Bad Block Detected\n", StatusBlock.AtaError));

+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Bad Block Detected\n", StatusBlock.AtaError));

     }

 

     if ((StatusBlock.AtaError & ATA_ERRREG_UNC) != 0) {

-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Uncorrectable Data\n", StatusBlock.AtaError));

+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Uncorrectable Data\n", StatusBlock.AtaError));

     }

 

     if ((StatusBlock.AtaError & ATA_ERRREG_MC) != 0) {

-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Media Change\n", StatusBlock.AtaError));

+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Media Change\n", StatusBlock.AtaError));

     }

 

     if ((StatusBlock.AtaError & ATA_ERRREG_ABRT) != 0) {

-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Abort\n", StatusBlock.AtaError));

+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Abort\n", StatusBlock.AtaError));

     }

 

     if ((StatusBlock.AtaError & ATA_ERRREG_TK0NF) != 0) {

-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Track 0 Not Found\n", StatusBlock.AtaError));

+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Track 0 Not Found\n", StatusBlock.AtaError));

     }

 

     if ((StatusBlock.AtaError & ATA_ERRREG_AMNF) != 0) {

-      DEBUG ((EFI_D_ERROR, "CheckRegisterStatus()-- %02x : Error : Address Mark Not Found\n", StatusBlock.AtaError));

+      DEBUG ((DEBUG_ERROR, "CheckRegisterStatus()-- %02x : Error : Address Mark Not Found\n", StatusBlock.AtaError));

     }

   }

   DEBUG_CODE_END ();

@@ -1162,7 +1162,7 @@ AtaUdmStatusWait (
     IoPortForBmis = (UINT16) (IdeRegisters->BusMasterBaseAddr + BMIS_OFFSET);

     RegisterValue = IdeReadPortB (PciIo, IoPortForBmis);

     if (((RegisterValue & BMIS_ERROR) != 0) || (Timeout == 0)) {

-      DEBUG ((EFI_D_ERROR, "ATA UDMA operation fails\n"));

+      DEBUG ((DEBUG_ERROR, "ATA UDMA operation fails\n"));

       Status = EFI_DEVICE_ERROR;

       break;

     }

@@ -1217,7 +1217,7 @@ AtaUdmStatusCheck (
   RegisterValue = IdeReadPortB (PciIo, IoPortForBmis);

 

   if ((RegisterValue & BMIS_ERROR) != 0) {

-    DEBUG ((EFI_D_ERROR, "ATA UDMA operation fails\n"));

+    DEBUG ((DEBUG_ERROR, "ATA UDMA operation fails\n"));

     return EFI_DEVICE_ERROR;

   }

 

@@ -2077,7 +2077,7 @@ IdeAtaSmartReturnStatusCheck (
     //

     // The threshold exceeded condition is not detected by the device

     //

-    DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));

+    DEBUG ((DEBUG_INFO, "The S.M.A.R.T threshold exceeded condition is not detected\n"));

     REPORT_STATUS_CODE (

           EFI_PROGRESS_CODE,

           (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD)

@@ -2086,7 +2086,7 @@ IdeAtaSmartReturnStatusCheck (
     //

     // The threshold exceeded condition is detected by the device

     //

-    DEBUG ((EFI_D_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));

+    DEBUG ((DEBUG_INFO, "The S.M.A.R.T threshold exceeded condition is detected\n"));

     REPORT_STATUS_CODE (

          EFI_PROGRESS_CODE,

          (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD)

@@ -2126,7 +2126,7 @@ IdeAtaSmartSupport (
     //

     // S.M.A.R.T is not supported by the device

     //

-    DEBUG ((EFI_D_INFO, "S.M.A.R.T feature is not supported at [%a] channel [%a] device!\n",

+    DEBUG ((DEBUG_INFO, "S.M.A.R.T feature is not supported at [%a] channel [%a] device!\n",

             (Channel == 1) ? "secondary" : "primary", (Device == 1) ? "slave" : "master"));

     REPORT_STATUS_CODE (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

@@ -2195,7 +2195,7 @@ IdeAtaSmartSupport (
       }

     }

 

-    DEBUG ((EFI_D_INFO, "Enabled S.M.A.R.T feature at [%a] channel [%a] device!\n",

+    DEBUG ((DEBUG_INFO, "Enabled S.M.A.R.T feature at [%a] channel [%a] device!\n",

            (Channel == 1) ? "secondary" : "primary", (Device == 1) ? "slave" : "master"));

 

   }

@@ -2392,7 +2392,7 @@ DetectAndConfigIdeDevice (
 

     Status = WaitForBSYClear (PciIo, IdeRegisters, 350000000);

     if (EFI_ERROR (Status)) {

-      DEBUG((EFI_D_ERROR, "New detecting method: Send Execute Diagnostic Command: WaitForBSYClear: Status: %d\n", Status));

+      DEBUG((DEBUG_ERROR, "New detecting method: Send Execute Diagnostic Command: WaitForBSYClear: Status: %d\n", Status));

       continue;

     }

 

@@ -2453,7 +2453,7 @@ DetectAndConfigIdeDevice (
       continue;

     }

 

-    DEBUG ((EFI_D_INFO, "[%a] channel [%a] [%a] device\n",

+    DEBUG ((DEBUG_INFO, "[%a] channel [%a] [%a] device\n",

             (IdeChannel == 1) ? "secondary" : "primary  ", (IdeDevice == 1) ? "slave " : "master",

             DeviceType == EfiIdeCdrom ? "cdrom   " : "harddisk"));

     //

@@ -2484,7 +2484,7 @@ DetectAndConfigIdeDevice (
                         &SupportedModes

                         );

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Calculate Mode Fail, Status = %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Calculate Mode Fail, Status = %r\n", Status));

       continue;

     }

 

@@ -2503,7 +2503,7 @@ DetectAndConfigIdeDevice (
       Status = SetDeviceTransferMode (Instance, IdeChannel, IdeDevice, &TransferMode, NULL);

 

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

         continue;

       }

     }

@@ -2520,7 +2520,7 @@ DetectAndConfigIdeDevice (
       Status = SetDeviceTransferMode (Instance, IdeChannel, IdeDevice, &TransferMode, NULL);

 

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

         continue;

       }

     } else if (SupportedModes->MultiWordDmaMode.Valid) {

@@ -2529,7 +2529,7 @@ DetectAndConfigIdeDevice (
       Status = SetDeviceTransferMode (Instance, IdeChannel, IdeDevice, &TransferMode, NULL);

 

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

+        DEBUG ((DEBUG_ERROR, "Set transfer Mode Fail, Status = %r\n", Status));

         continue;

       }

     }

@@ -2619,7 +2619,7 @@ IdeModeInitialization (
                         &MaxDevices

                         );

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "[GetChannel, Status=%x]", Status));

+      DEBUG ((DEBUG_ERROR, "[GetChannel, Status=%x]", Status));

       continue;

     }

 

@@ -2658,4 +2658,3 @@ IdeModeInitialization (
 ErrorExit:

   return Status;

 }

-

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index 28f8638c52..6c3268896b 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -358,7 +358,7 @@ RegisterAtaDevice (
   // If yes, then install Storage Security Protocol at the ata device handle.

   //

   if ((AtaDevice->IdentifyData->trusted_computing_support & BIT0) != 0) {

-    DEBUG ((EFI_D_INFO, "Found TCG support in Port %x PortMultiplierPort %x\n", Port, PortMultiplierPort));

+    DEBUG ((DEBUG_INFO, "Found TCG support in Port %x PortMultiplierPort %x\n", Port, PortMultiplierPort));

     Status = gBS->InstallProtocolInterface (

                     &AtaDevice->Handle,

                     &gEfiStorageSecurityCommandProtocolGuid,

@@ -368,7 +368,7 @@ RegisterAtaDevice (
     if (EFI_ERROR (Status)) {

       goto Done;

     }

-    DEBUG ((EFI_D_INFO, "Successfully Install Storage Security Protocol on the ATA device\n"));

+    DEBUG ((DEBUG_INFO, "Successfully Install Storage Security Protocol on the ATA device\n"));

   }

 

   gBS->OpenProtocol (

@@ -387,7 +387,7 @@ Done:
 

   if (EFI_ERROR (Status) && (AtaDevice != NULL)) {

     ReleaseAtaResources (AtaDevice);

-    DEBUG ((EFI_D_ERROR | EFI_D_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));

+    DEBUG ((DEBUG_ERROR | DEBUG_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));

   }

   return Status;

 }

@@ -1537,7 +1537,7 @@ AtaStorageSecurityReceiveData (
   ATA_DEVICE                       *Private;

   EFI_TPL                          OldTpl;

 

-  DEBUG ((EFI_D_INFO, "EFI Storage Security Protocol - Read\n"));

+  DEBUG ((DEBUG_INFO, "EFI Storage Security Protocol - Read\n"));

   if ((PayloadBuffer == NULL || PayloadTransferSize == NULL) && PayloadBufferSize != 0) {

     return EFI_INVALID_PARAMETER;

   }

@@ -1647,7 +1647,7 @@ AtaStorageSecuritySendData (
   ATA_DEVICE                       *Private;

   EFI_TPL                          OldTpl;

 

-  DEBUG ((EFI_D_INFO, "EFI Storage Security Protocol - Send\n"));

+  DEBUG ((DEBUG_INFO, "EFI Storage Security Protocol - Send\n"));

   if ((PayloadBuffer == NULL) && (PayloadBufferSize != 0)) {

     return EFI_INVALID_PARAMETER;

   }

@@ -1709,4 +1709,3 @@ InitializeAtaBus(
 

   return Status;

 }

-

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 79026a4a95..8655da599d 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -309,7 +309,7 @@ IdentifyAtaDevice (
     return EFI_UNSUPPORTED;

   }

 

-  DEBUG ((EFI_D_INFO, "AtaBus - Identify Device: Port %x PortMultiplierPort %x\n", AtaDevice->Port, AtaDevice->PortMultiplierPort));

+  DEBUG ((DEBUG_INFO, "AtaBus - Identify Device: Port %x PortMultiplierPort %x\n", AtaDevice->Port, AtaDevice->PortMultiplierPort));

 

   //

   // Check whether the WORD 88 (supported UltraDMA by drive) is valid

@@ -674,7 +674,7 @@ AtaNonBlockingCallBack (
   }

 

   DEBUG ((

-    EFI_D_BLKIO,

+    DEBUG_BLKIO,

     "NON-BLOCKING EVENT FINISHED!- STATUS = %r\n",

     Task->Token->TransactionStatus

     ));

@@ -683,7 +683,7 @@ AtaNonBlockingCallBack (
   // Reduce the SubEventCount, till it comes to zero.

   //

   (*Task->UnsignalledEventCount) --;

-  DEBUG ((EFI_D_BLKIO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));

+  DEBUG ((DEBUG_BLKIO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));

 

   //

   // Remove the SubTask from the Task list.

@@ -696,7 +696,7 @@ AtaNonBlockingCallBack (
     //

     if (!(*Task->IsError)) {

       gBS->SignalEvent (Task->Token->Event);

-      DEBUG ((EFI_D_BLKIO, "Signal the upper layer event!\n"));

+      DEBUG ((DEBUG_BLKIO, "Signal the upper layer event!\n"));

     }

 

     FreePool (Task->UnsignalledEventCount);

@@ -709,8 +709,8 @@ AtaNonBlockingCallBack (
     if (!IsListEmpty (&AtaDevice->AtaTaskList)) {

       Entry   = GetFirstNode (&AtaDevice->AtaTaskList);

       AtaTask = ATA_ASYN_TASK_FROM_ENTRY (Entry);

-      DEBUG ((EFI_D_BLKIO, "Start to embark a new Ata Task\n"));

-      DEBUG ((EFI_D_BLKIO, "AtaTask->NumberOfBlocks = %x; AtaTask->Token=%x\n", AtaTask->NumberOfBlocks, AtaTask->Token));

+      DEBUG ((DEBUG_BLKIO, "Start to embark a new Ata Task\n"));

+      DEBUG ((DEBUG_BLKIO, "AtaTask->NumberOfBlocks = %x; AtaTask->Token=%x\n", AtaTask->NumberOfBlocks, AtaTask->Token));

       Status = AccessAtaDevice (

                  AtaTask->AtaDevice,

                  AtaTask->Buffer,

@@ -729,7 +729,7 @@ AtaNonBlockingCallBack (
   }

 

   DEBUG ((

-    EFI_D_BLKIO,

+    DEBUG_BLKIO,

     "PACKET INFO: Write=%s, Length=%x, LowCylinder=%x, HighCylinder=%x, SectionNumber=%x\n",

     Task->Packet.OutDataBuffer != NULL ? L"YES" : L"NO",

     Task->Packet.OutDataBuffer != NULL ? Task->Packet.OutTransferLength : Task->Packet.InTransferLength,

@@ -838,13 +838,13 @@ AccessAtaDevice(
       FreePool (EventCount);

       return EFI_OUT_OF_RESOURCES;

     }

-    DEBUG ((EFI_D_BLKIO, "Allocation IsError Addr=%x\n", IsError));

+    DEBUG ((DEBUG_BLKIO, "Allocation IsError Addr=%x\n", IsError));

     *IsError = FALSE;

     TempCount   = (NumberOfBlocks + MaxTransferBlockNumber - 1) / MaxTransferBlockNumber;

     *EventCount = TempCount;

-    DEBUG ((EFI_D_BLKIO, "AccessAtaDevice, NumberOfBlocks=%x\n", NumberOfBlocks));

-    DEBUG ((EFI_D_BLKIO, "AccessAtaDevice, MaxTransferBlockNumber=%x\n", MaxTransferBlockNumber));

-    DEBUG ((EFI_D_BLKIO, "AccessAtaDevice, EventCount=%x\n", TempCount));

+    DEBUG ((DEBUG_BLKIO, "AccessAtaDevice, NumberOfBlocks=%x\n", NumberOfBlocks));

+    DEBUG ((DEBUG_BLKIO, "AccessAtaDevice, MaxTransferBlockNumber=%x\n", MaxTransferBlockNumber));

+    DEBUG ((DEBUG_BLKIO, "AccessAtaDevice, EventCount=%x\n", TempCount));

   } else {

     while (!IsListEmpty (&AtaDevice->AtaTaskList) || !IsListEmpty (&AtaDevice->AtaSubTaskList)) {

       //

@@ -906,7 +906,7 @@ AccessAtaDevice(
       //

       // Blocking Mode.

       //

-      DEBUG ((EFI_D_BLKIO, "Blocking AccessAtaDevice, TransferBlockNumber=%x; StartLba = %x\n", TransferBlockNumber, StartLba));

+      DEBUG ((DEBUG_BLKIO, "Blocking AccessAtaDevice, TransferBlockNumber=%x; StartLba = %x\n", TransferBlockNumber, StartLba));

       Status = TransferAtaDevice (AtaDevice, NULL, Buffer, StartLba, (UINT32) TransferBlockNumber, IsWrite, NULL);

     }