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>

2 files changed, 18 insertions, 18 deletions

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
index 163e931..a715186 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
@@ -119,13 +119,13 @@ IntersectIoDescriptor (
     Status = gDS->AddIoSpace (EfiGcdIoTypeIo, IntersectionBase,

                     IntersectionEnd - IntersectionBase);

 

-    DEBUG ((EFI_ERROR (Status) ? EFI_D_ERROR : EFI_D_VERBOSE,

+    DEBUG ((EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,

       "%a: %a: add [%Lx, %Lx): %r\n", gEfiCallerBaseName, __FUNCTION__,

       IntersectionBase, IntersectionEnd, Status));

     return Status;

   }

 

-  DEBUG ((EFI_D_ERROR, "%a: %a: desc [%Lx, %Lx) type %u conflicts with "

+  DEBUG ((DEBUG_ERROR, "%a: %a: desc [%Lx, %Lx) type %u conflicts with "

     "aperture [%Lx, %Lx)\n", gEfiCallerBaseName, __FUNCTION__,

     Descriptor->BaseAddress, Descriptor->BaseAddress + Descriptor->Length,

     (UINT32)Descriptor->GcdIoType, Base, Base + Length));

@@ -155,7 +155,7 @@ AddIoSpace (
 

   Status = gDS->GetIoSpaceMap (&NumberOfDescriptors, &IoSpaceMap);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "%a: %a: GetIoSpaceMap(): %r\n",

+    DEBUG ((DEBUG_ERROR, "%a: %a: GetIoSpaceMap(): %r\n",

       gEfiCallerBaseName, __FUNCTION__, Status));

     return Status;

   }

@@ -263,13 +263,13 @@ IntersectMemoryDescriptor (
                     IntersectionBase, IntersectionEnd - IntersectionBase,

                     Capabilities);

 

-    DEBUG ((EFI_ERROR (Status) ? EFI_D_ERROR : EFI_D_VERBOSE,

+    DEBUG ((EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,

       "%a: %a: add [%Lx, %Lx): %r\n", gEfiCallerBaseName, __FUNCTION__,

       IntersectionBase, IntersectionEnd, Status));

     return Status;

   }

 

-  DEBUG ((EFI_D_ERROR, "%a: %a: desc [%Lx, %Lx) type %u cap %Lx conflicts "

+  DEBUG ((DEBUG_ERROR, "%a: %a: desc [%Lx, %Lx) type %u cap %Lx conflicts "

     "with aperture [%Lx, %Lx) cap %Lx\n", gEfiCallerBaseName, __FUNCTION__,

     Descriptor->BaseAddress, Descriptor->BaseAddress + Descriptor->Length,

     (UINT32)Descriptor->GcdMemoryType, Descriptor->Capabilities,

@@ -302,7 +302,7 @@ AddMemoryMappedIoSpace (
 

   Status = gDS->GetMemorySpaceMap (&NumberOfDescriptors, &MemorySpaceMap);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "%a: %a: GetMemorySpaceMap(): %r\n",

+    DEBUG ((DEBUG_ERROR, "%a: %a: GetMemorySpaceMap(): %r\n",

       gEfiCallerBaseName, __FUNCTION__, Status));

     return Status;

   }

@@ -828,7 +828,7 @@ NotifyPhase (
       }

     }

 

-    DEBUG ((EFI_D_INFO, "PciHostBridge: NotifyPhase (AllocateResources)\n"));

+    DEBUG ((DEBUG_INFO, "PciHostBridge: NotifyPhase (AllocateResources)\n"));

     for (Link = GetFirstNode (&HostBridge->RootBridges)

          ; !IsNull (&HostBridge->RootBridges, Link)

          ; Link = GetNextNode (&HostBridge->RootBridges, Link)

@@ -838,7 +838,7 @@ NotifyPhase (
       }

 

       RootBridge = ROOT_BRIDGE_FROM_LINK (Link);

-      DEBUG ((EFI_D_INFO, " RootBridge: %s\n", RootBridge->DevicePathStr));

+      DEBUG ((DEBUG_INFO, " RootBridge: %s\n", RootBridge->DevicePathStr));

 

       for (Index1 = TypeIo; Index1 < TypeBus; Index1++) {

         if (RootBridge->ResAllocNode[Index1].Status == ResNone) {

@@ -1360,7 +1360,7 @@ SubmitResources (
        ) {

     RootBridge = ROOT_BRIDGE_FROM_LINK (Link);

     if (RootBridgeHandle == RootBridge->Handle) {

-      DEBUG ((EFI_D_INFO, "PciHostBridge: SubmitResources for %s\n", RootBridge->DevicePathStr));

+      DEBUG ((DEBUG_INFO, "PciHostBridge: SubmitResources for %s\n", RootBridge->DevicePathStr));

       //

       // Check the resource descriptors.

       // If the Configuration includes one or more invalid resource descriptors, all the resource

@@ -1371,11 +1371,11 @@ SubmitResources (
           return EFI_INVALID_PARAMETER;

         }

 

-        DEBUG ((EFI_D_INFO, " %s: Granularity/SpecificFlag = %ld / %02x%s\n",

+        DEBUG ((DEBUG_INFO, " %s: Granularity/SpecificFlag = %ld / %02x%s\n",

                 mAcpiAddressSpaceTypeStr[Descriptor->ResType], Descriptor->AddrSpaceGranularity, Descriptor->SpecificFlag,

                 (Descriptor->SpecificFlag & EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE) != 0 ? L" (Prefetchable)" : L""

                 ));

-        DEBUG ((EFI_D_INFO, "      Length/Alignment = 0x%lx / 0x%lx\n", Descriptor->AddrLen, Descriptor->AddrRangeMax));

+        DEBUG ((DEBUG_INFO, "      Length/Alignment = 0x%lx / 0x%lx\n", Descriptor->AddrLen, Descriptor->AddrRangeMax));

         switch (Descriptor->ResType) {

         case ACPI_ADDRESS_SPACE_TYPE_MEM:

           if (Descriptor->AddrSpaceGranularity != 32 && Descriptor->AddrSpaceGranularity != 64) {

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
index d304fae..2f1bed8 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -71,17 +71,17 @@ CreateRootBridge (
 

   DevicePathStr = NULL;

 

-  DEBUG ((EFI_D_INFO, "RootBridge: "));

-  DEBUG ((EFI_D_INFO, "%s\n", DevicePathStr = ConvertDevicePathToText (Bridge->DevicePath, FALSE, FALSE)));

-  DEBUG ((EFI_D_INFO, "  Support/Attr: %lx / %lx\n", Bridge->Supports, Bridge->Attributes));

-  DEBUG ((EFI_D_INFO, "    DmaAbove4G: %s\n", Bridge->DmaAbove4G ? L"Yes" : L"No"));

-  DEBUG ((EFI_D_INFO, "NoExtConfSpace: %s\n", Bridge->NoExtendedConfigSpace ? L"Yes" : L"No"));

-  DEBUG ((EFI_D_INFO, "     AllocAttr: %lx (%s%s)\n", Bridge->AllocationAttributes,

+  DEBUG ((DEBUG_INFO, "RootBridge: "));

+  DEBUG ((DEBUG_INFO, "%s\n", DevicePathStr = ConvertDevicePathToText (Bridge->DevicePath, FALSE, FALSE)));

+  DEBUG ((DEBUG_INFO, "  Support/Attr: %lx / %lx\n", Bridge->Supports, Bridge->Attributes));

+  DEBUG ((DEBUG_INFO, "    DmaAbove4G: %s\n", Bridge->DmaAbove4G ? L"Yes" : L"No"));

+  DEBUG ((DEBUG_INFO, "NoExtConfSpace: %s\n", Bridge->NoExtendedConfigSpace ? L"Yes" : L"No"));

+  DEBUG ((DEBUG_INFO, "     AllocAttr: %lx (%s%s)\n", Bridge->AllocationAttributes,

           (Bridge->AllocationAttributes & EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM) != 0 ? L"CombineMemPMem " : L"",

           (Bridge->AllocationAttributes & EFI_PCI_HOST_BRIDGE_MEM64_DECODE) != 0 ? L"Mem64Decode" : L""

           ));

   DEBUG ((

-    EFI_D_INFO, "           Bus: %lx - %lx Translation=%lx\n",

+    DEBUG_INFO, "           Bus: %lx - %lx Translation=%lx\n",

     Bridge->Bus.Base, Bridge->Bus.Limit, Bridge->Bus.Translation

     ));

   //