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, 35 insertions, 37 deletions

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 3ec5ecf0e4..9f78f3dbd3 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -323,7 +323,7 @@ Uhci2GetCapability (
 

   Uhc->RootPorts = *PortNumber;

 

-  DEBUG ((EFI_D_INFO, "Uhci2GetCapability: %d ports\n", (UINT32)Uhc->RootPorts));

+  DEBUG ((DEBUG_INFO, "Uhci2GetCapability: %d ports\n", (UINT32)Uhc->RootPorts));

   return EFI_SUCCESS;

 }

 

@@ -378,7 +378,7 @@ Uhci2GetRootHubPortStatus (
   }

 

   if ((PortSC & USBPORTSC_SUSP) != 0) {

-    DEBUG ((EFI_D_INFO, "Uhci2GetRootHubPortStatus: port %d is suspended\n", PortNumber));

+    DEBUG ((DEBUG_INFO, "Uhci2GetRootHubPortStatus: port %d is suspended\n", PortNumber));

     PortStatus->PortStatus |= USB_PORT_STAT_SUSPEND;

   }

 

@@ -1880,4 +1880,3 @@ UhciDriverBindingStop (
 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
index 517780a5f4..3d499c9baf 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
@@ -20,12 +20,12 @@ UhciDumpQh (
   IN UHCI_QH_SW    *QhSw

   )

 {

-  DEBUG ((EFI_D_VERBOSE, "&QhSw @ 0x%p\n", QhSw));

-  DEBUG ((EFI_D_VERBOSE, "QhSw.NextQh    - 0x%p\n", QhSw->NextQh));

-  DEBUG ((EFI_D_VERBOSE, "QhSw.TDs       - 0x%p\n", QhSw->TDs));

-  DEBUG ((EFI_D_VERBOSE, "QhSw.QhHw:\n"));

-  DEBUG ((EFI_D_VERBOSE, " Horizon  Link - %x\n", QhSw->QhHw.HorizonLink));

-  DEBUG ((EFI_D_VERBOSE, " Vertical Link - %x\n\n", QhSw->QhHw.VerticalLink));

+  DEBUG ((DEBUG_VERBOSE, "&QhSw @ 0x%p\n", QhSw));

+  DEBUG ((DEBUG_VERBOSE, "QhSw.NextQh    - 0x%p\n", QhSw->NextQh));

+  DEBUG ((DEBUG_VERBOSE, "QhSw.TDs       - 0x%p\n", QhSw->TDs));

+  DEBUG ((DEBUG_VERBOSE, "QhSw.QhHw:\n"));

+  DEBUG ((DEBUG_VERBOSE, " Horizon  Link - %x\n", QhSw->QhHw.HorizonLink));

+  DEBUG ((DEBUG_VERBOSE, " Vertical Link - %x\n\n", QhSw->QhHw.VerticalLink));

 }

 

 

@@ -45,27 +45,26 @@ UhciDumpTds (
   CurTdSw = TdSw;

 

   while (CurTdSw != NULL) {

-    DEBUG ((EFI_D_VERBOSE, "TdSw @ 0x%p\n",           CurTdSw));

-    DEBUG ((EFI_D_VERBOSE, "TdSw.NextTd   - 0x%p\n",  CurTdSw->NextTd));

-    DEBUG ((EFI_D_VERBOSE, "TdSw.DataLen  - %d\n",    CurTdSw->DataLen));

-    DEBUG ((EFI_D_VERBOSE, "TdSw.Data     - 0x%p\n",  CurTdSw->Data));

-    DEBUG ((EFI_D_VERBOSE, "TdHw:\n"));

-    DEBUG ((EFI_D_VERBOSE, " NextLink     - 0x%x\n",  CurTdSw->TdHw.NextLink));

-    DEBUG ((EFI_D_VERBOSE, " ActualLen    - %d\n",    CurTdSw->TdHw.ActualLen));

-    DEBUG ((EFI_D_VERBOSE, " Status       - 0x%x\n",  CurTdSw->TdHw.Status));

-    DEBUG ((EFI_D_VERBOSE, " IOC          - %d\n",    CurTdSw->TdHw.IntOnCpl));

-    DEBUG ((EFI_D_VERBOSE, " IsIsoCh      - %d\n",    CurTdSw->TdHw.IsIsoch));

-    DEBUG ((EFI_D_VERBOSE, " LowSpeed     - %d\n",    CurTdSw->TdHw.LowSpeed));

-    DEBUG ((EFI_D_VERBOSE, " ErrorCount   - %d\n",    CurTdSw->TdHw.ErrorCount));

-    DEBUG ((EFI_D_VERBOSE, " ShortPacket  - %d\n",    CurTdSw->TdHw.ShortPacket));

-    DEBUG ((EFI_D_VERBOSE, " PidCode      - 0x%x\n",  CurTdSw->TdHw.PidCode));

-    DEBUG ((EFI_D_VERBOSE, " DevAddr      - %d\n",    CurTdSw->TdHw.DeviceAddr));

-    DEBUG ((EFI_D_VERBOSE, " EndPoint     - %d\n",    CurTdSw->TdHw.EndPoint));

-    DEBUG ((EFI_D_VERBOSE, " DataToggle   - %d\n",    CurTdSw->TdHw.DataToggle));

-    DEBUG ((EFI_D_VERBOSE, " MaxPacketLen - %d\n",    CurTdSw->TdHw.MaxPacketLen));

-    DEBUG ((EFI_D_VERBOSE, " DataBuffer   - 0x%x\n\n",CurTdSw->TdHw.DataBuffer));

+    DEBUG ((DEBUG_VERBOSE, "TdSw @ 0x%p\n",           CurTdSw));

+    DEBUG ((DEBUG_VERBOSE, "TdSw.NextTd   - 0x%p\n",  CurTdSw->NextTd));

+    DEBUG ((DEBUG_VERBOSE, "TdSw.DataLen  - %d\n",    CurTdSw->DataLen));

+    DEBUG ((DEBUG_VERBOSE, "TdSw.Data     - 0x%p\n",  CurTdSw->Data));

+    DEBUG ((DEBUG_VERBOSE, "TdHw:\n"));

+    DEBUG ((DEBUG_VERBOSE, " NextLink     - 0x%x\n",  CurTdSw->TdHw.NextLink));

+    DEBUG ((DEBUG_VERBOSE, " ActualLen    - %d\n",    CurTdSw->TdHw.ActualLen));

+    DEBUG ((DEBUG_VERBOSE, " Status       - 0x%x\n",  CurTdSw->TdHw.Status));

+    DEBUG ((DEBUG_VERBOSE, " IOC          - %d\n",    CurTdSw->TdHw.IntOnCpl));

+    DEBUG ((DEBUG_VERBOSE, " IsIsoCh      - %d\n",    CurTdSw->TdHw.IsIsoch));

+    DEBUG ((DEBUG_VERBOSE, " LowSpeed     - %d\n",    CurTdSw->TdHw.LowSpeed));

+    DEBUG ((DEBUG_VERBOSE, " ErrorCount   - %d\n",    CurTdSw->TdHw.ErrorCount));

+    DEBUG ((DEBUG_VERBOSE, " ShortPacket  - %d\n",    CurTdSw->TdHw.ShortPacket));

+    DEBUG ((DEBUG_VERBOSE, " PidCode      - 0x%x\n",  CurTdSw->TdHw.PidCode));

+    DEBUG ((DEBUG_VERBOSE, " DevAddr      - %d\n",    CurTdSw->TdHw.DeviceAddr));

+    DEBUG ((DEBUG_VERBOSE, " EndPoint     - %d\n",    CurTdSw->TdHw.EndPoint));

+    DEBUG ((DEBUG_VERBOSE, " DataToggle   - %d\n",    CurTdSw->TdHw.DataToggle));

+    DEBUG ((DEBUG_VERBOSE, " MaxPacketLen - %d\n",    CurTdSw->TdHw.MaxPacketLen));

+    DEBUG ((DEBUG_VERBOSE, " DataBuffer   - 0x%x\n\n",CurTdSw->TdHw.DataBuffer));

 

     CurTdSw = CurTdSw->NextTd;

   }

 }

-

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c
index 582c25e78d..44bcde4c4e 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c
@@ -38,7 +38,7 @@ UhciReadReg (
                       );

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "UhciReadReg: PciIo Io.Read error: %r at offset %d\n", Status, Offset));

+    DEBUG ((DEBUG_ERROR, "UhciReadReg: PciIo Io.Read error: %r at offset %d\n", Status, Offset));

 

     Data = 0xFFFF;

   }

@@ -74,7 +74,7 @@ UhciWriteReg (
                       );

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "UhciWriteReg: PciIo Io.Write error: %r at offset %d\n", Status, Offset));

+    DEBUG ((DEBUG_ERROR, "UhciWriteReg: PciIo Io.Write error: %r at offset %d\n", Status, Offset));

   }

 }

 

@@ -144,7 +144,7 @@ UhciAckAllInterrupt (
   // is a temporary error status.

   //

   if (!UhciIsHcWorking (Uhc->PciIo)) {

-    DEBUG ((EFI_D_ERROR, "UhciAckAllInterrupt: re-enable the UHCI from system error\n"));

+    DEBUG ((DEBUG_ERROR, "UhciAckAllInterrupt: re-enable the UHCI from system error\n"));

     Uhc->Usb2Hc.SetState (&Uhc->Usb2Hc, EfiUsbHcStateOperational);

   }

 }

@@ -208,7 +208,7 @@ UhciIsHcWorking (
   UsbSts = UhciReadReg (PciIo, USBSTS_OFFSET);

 

   if ((UsbSts & (USBSTS_HCPE | USBSTS_HSE | USBSTS_HCH)) != 0) {

-    DEBUG ((EFI_D_ERROR, "UhciIsHcWorking: current USB state is %x\n", UsbSts));

+    DEBUG ((DEBUG_ERROR, "UhciIsHcWorking: current USB state is %x\n", UsbSts));

     return FALSE;

   }

 

@@ -245,7 +245,7 @@ UhciSetFrameListBaseAddr (
                        );

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "UhciSetFrameListBaseAddr: PciIo Io.Write error: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "UhciSetFrameListBaseAddr: PciIo Io.Write error: %r\n", Status));

   }

 }

 

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index e216418849..0829bc2a8c 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -600,14 +600,14 @@ UhciExecuteTransfer (
   }

 

   if (!Finished) {

-    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", (UINT32)TimeOut));

+    DEBUG ((DEBUG_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", (UINT32)TimeOut));

     UhciDumpQh (Qh);

     UhciDumpTds (Td);

 

     Status = EFI_TIMEOUT;

 

   } else if (QhResult->Result != EFI_USB_NOERROR) {

-    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution failed with result %x\n", QhResult->Result));

+    DEBUG ((DEBUG_ERROR, "UhciExecuteTransfer: execution failed with result %x\n", QhResult->Result));

     UhciDumpQh (Qh);

     UhciDumpTds (Td);

 

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c
index 9aade19f8e..a8c098f9c3 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c
@@ -468,7 +468,7 @@ UsbHcAllocateMem (
   NewBlock = UsbHcAllocMemBlock (Pool, Pages);

 

   if (NewBlock == NULL) {

-    DEBUG ((EFI_D_INFO, "UsbHcAllocateMem: failed to allocate block\n"));

+    DEBUG ((DEBUG_INFO, "UsbHcAllocateMem: failed to allocate block\n"));

     return NULL;

   }