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>

4 files changed, 10 insertions, 12 deletions

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index e8cd4ce120..114c46addd 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -330,7 +330,7 @@ ToggleStateSyncKeyNotify (
                                     );

     }

     mConIn.PhysicalKeyToggleState = KeyData->KeyState.KeyToggleState;

-    DEBUG ((EFI_D_INFO, "Current toggle state is 0x%02x\n", mConIn.PhysicalKeyToggleState));

+    DEBUG ((DEBUG_INFO, "Current toggle state is 0x%02x\n", mConIn.PhysicalKeyToggleState));

   }

 

   return EFI_SUCCESS;

@@ -3615,7 +3615,7 @@ ConSplitterTextInReadKeyStroke (
   // Signal ConnectConIn event on first call in Lazy ConIn mode

   //

   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {

-    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));

+    DEBUG ((DEBUG_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));

     gBS->SignalEvent (Private->ConnectConInEvent);

     mConInIsConnect = TRUE;

   }

@@ -3809,7 +3809,7 @@ ConSplitterTextInReadKeyStrokeEx (
   // Signal ConnectConIn event on first call in Lazy ConIn mode

   //

   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {

-    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));

+    DEBUG ((DEBUG_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));

     gBS->SignalEvent (Private->ConnectConInEvent);

     mConInIsConnect = TRUE;

   }

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index d6d8db51d5..838c3337c7 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -337,7 +337,7 @@ InitializeGraphicsConsoleTextMode (
 

   DEBUG_CODE (

     for (Index = 0; Index < ValidCount; Index++) {

-      DEBUG ((EFI_D_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",

+      DEBUG ((DEBUG_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",

                            Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));

     }

   );

@@ -551,7 +551,7 @@ GraphicsConsoleControllerDriverStart (
     }

   }

 

-  DEBUG ((EFI_D_INFO, "GraphicsConsole video resolution %d x %d\n", HorizontalResolution, VerticalResolution));

+  DEBUG ((DEBUG_INFO, "GraphicsConsole video resolution %d x %d\n", HorizontalResolution, VerticalResolution));

 

   //

   // Initialize the mode which GraphicsConsole supports.

@@ -2132,5 +2132,3 @@ InitializeGraphicsConsole (
 

   return Status;

 }

-

-

diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c b/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
index 99a76aa55c..ef82daebed 100644
--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
+++ b/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
@@ -323,10 +323,10 @@ GraphicsOutputDriverBindingStart (
     // Use default device infomation when the device info HOB doesn't exist

     //

     DeviceInfo = &mDefaultGraphicsDeviceInfo;

-    DEBUG ((EFI_D_INFO, "[%a]: GraphicsDeviceInfo HOB doesn't exist!\n", gEfiCallerBaseName));

+    DEBUG ((DEBUG_INFO, "[%a]: GraphicsDeviceInfo HOB doesn't exist!\n", gEfiCallerBaseName));

   } else {

     DeviceInfo = (EFI_PEI_GRAPHICS_DEVICE_INFO_HOB *) (GET_GUID_HOB_DATA (HobStart));

-    DEBUG ((EFI_D_INFO, "[%a]: GraphicsDeviceInfo HOB:\n"

+    DEBUG ((DEBUG_INFO, "[%a]: GraphicsDeviceInfo HOB:\n"

             "  VendorId = %04x, DeviceId = %04x,\n"

             "  RevisionId = %02x, BarIndex = %x,\n"

             "  SubsystemVendorId = %04x, SubsystemId = %04x\n",

@@ -395,7 +395,7 @@ GraphicsOutputDriverBindingStart (
         }

         Status = PciIo->GetBarAttributes (PciIo, Index, NULL, (VOID**) &Resources);

         if (!EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_INFO, "[%a]: BAR[%d]: Base = %lx, Length = %lx\n",

+          DEBUG ((DEBUG_INFO, "[%a]: BAR[%d]: Base = %lx, Length = %lx\n",

                   gEfiCallerBaseName, Index, Resources->AddrRangeMin, Resources->AddrLen));

           if ((Resources->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) &&

             (Resources->Len == (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3)) &&

@@ -403,7 +403,7 @@ GraphicsOutputDriverBindingStart (
               (Resources->AddrLen >= GraphicsInfo->FrameBufferSize)

               ) {

             FrameBufferBase = Resources->AddrRangeMin;

-            DEBUG ((EFI_D_INFO, "[%a]: ... matched!\n", gEfiCallerBaseName));

+            DEBUG ((DEBUG_INFO, "[%a]: ... matched!\n", gEfiCallerBaseName));

             break;

           }

         }

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index f8c71f95c1..4d6ede4c9f 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -2025,7 +2025,7 @@ UnicodeToEfiKey (
           continue;

         }

         else {

-          DEBUG ((EFI_D_ERROR, "Unexpected state in escape2\n"));

+          DEBUG ((DEBUG_ERROR, "Unexpected state in escape2\n"));

         }

       }

       TerminalDevice->ResetState = RESET_STATE_DEFAULT;