From 87000d77082339be464d07855d9fc194c6b4e8a6 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Tue, 16 Nov 2021 19:21:29 -0800 Subject: 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 Cc: Leif Lindholm Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao --- MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 6 +++--- MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c | 4 ++-- MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c | 10 +++++----- MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c | 14 +++++++------- MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c | 2 +- MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c | 16 ++++++++-------- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'MdeModulePkg/Library/UefiBootManagerLib') diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c index 95d185b639..a862e04a89 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c @@ -1807,7 +1807,7 @@ EfiBootManagerBoot ( } if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "[Bds] Failed to create Boot#### for a temporary boot - %r!\n", Status)); + DEBUG ((DEBUG_ERROR, "[Bds] Failed to create Boot#### for a temporary boot - %r!\n", Status)); BootOption->Status = Status; return ; } @@ -1830,7 +1830,7 @@ EfiBootManagerBoot ( // the boot option. // if (BmIsBootManagerMenuFilePath (BootOption->FilePath)) { - DEBUG ((EFI_D_INFO, "[Bds] Booting Boot Manager Menu.\n")); + DEBUG ((DEBUG_INFO, "[Bds] Booting Boot Manager Menu.\n")); BmStopHotkeyService (NULL, NULL); } else { EfiSignalEventReadyToBoot(); @@ -2440,7 +2440,7 @@ BmRegisterBootManagerMenu ( &DevicePath ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, "[Bds]BootManagerMenu FFS section can not be found, skip its boot option registration\n")); + DEBUG ((DEBUG_WARN, "[Bds]BootManagerMenu FFS section can not be found, skip its boot option registration\n")); return EFI_NOT_FOUND; } ASSERT (DevicePath != NULL); diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c b/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c index d89331784c..bdbb9a8770 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c @@ -199,7 +199,7 @@ EfiBootManagerGetGopDevicePath ( // // Recursively look for GOP child in this frame buffer handle // - DEBUG ((EFI_D_INFO, "[Bds] Looking for GOP child deeper ... \n")); + DEBUG ((DEBUG_INFO, "[Bds] Looking for GOP child deeper ... \n")); TempDevicePath = GopPool; ReturnDevicePath = EfiBootManagerGetGopDevicePath (OpenInfoBuffer[Index].ControllerHandle); GopPool = AppendDevicePathInstance (GopPool, ReturnDevicePath); @@ -340,7 +340,7 @@ BmUpdateSystemTableConsole ( // Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize); if (Instance == NULL) { - DEBUG ((EFI_D_ERROR, "[Bds] No valid console instance is found for %s!\n", VarName)); + DEBUG ((DEBUG_ERROR, "[Bds] No valid console instance is found for %s!\n", VarName)); // We should not ASSERT when all the console devices are removed. // ASSERT_EFI_ERROR (EFI_NOT_FOUND); FreePool (FullDevicePath); diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c index fa1fd87d15..332a967d37 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c @@ -129,7 +129,7 @@ BmDisplayMessages ( DriverHealthInfo->ChildHandle ); - DEBUG ((EFI_D_INFO, "Controller: %s\n", ControllerName)); + DEBUG ((DEBUG_INFO, "Controller: %s\n", ControllerName)); Print (L"Controller: %s\n", ControllerName); for (Index = 0; DriverHealthInfo->MessageList[Index].HiiHandle != NULL; Index++) { String = HiiGetString ( @@ -139,7 +139,7 @@ BmDisplayMessages ( ); if (String != NULL) { Print (L" %s\n", String); - DEBUG ((EFI_D_INFO, " %s\n", String)); + DEBUG ((DEBUG_INFO, " %s\n", String)); FreePool (String); } } @@ -167,7 +167,7 @@ BmRepairNotify ( IN UINTN Limit ) { - DEBUG ((EFI_D_INFO, "[BDS]RepairNotify: %d/%d\n", Value, Limit)); + DEBUG ((DEBUG_INFO, "[BDS]RepairNotify: %d/%d\n", Value, Limit)); Print (L"[BDS]RepairNotify: %d/%d\n", Value, Limit); return EFI_SUCCESS; @@ -556,7 +556,7 @@ BmRepairAllControllers ( DriverHealthInfo[Index].ChildHandle ); DEBUG (( - EFI_D_INFO, + DEBUG_INFO, "%02d: %s - %s\n", Index, ControllerName, @@ -579,7 +579,7 @@ BmRepairAllControllers ( } if (RebootRequired) { - DEBUG ((EFI_D_INFO, "[BDS] One of the Driver Health instances requires rebooting.\n")); + DEBUG ((DEBUG_INFO, "[BDS] One of the Driver Health instances requires rebooting.\n")); gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL); } } diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c index c2d1447f59..25da95b669 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c @@ -353,7 +353,7 @@ BmHotkeyCallback ( return EFI_SUCCESS; } - DEBUG ((EFI_D_INFO, "[Bds]BmHotkeyCallback: %04x:%04x\n", KeyData->Key.ScanCode, KeyData->Key.UnicodeChar)); + DEBUG ((DEBUG_INFO, "[Bds]BmHotkeyCallback: %04x:%04x\n", KeyData->Key.ScanCode, KeyData->Key.UnicodeChar)); EfiAcquireLock (&mBmHotkeyLock); for ( Link = GetFirstNode (&mBmHotkeyList) @@ -399,12 +399,12 @@ BmHotkeyCallback ( mBmLoadOptionName[LoadOptionTypeBoot], Hotkey->BootOption ); Status = EfiBootManagerVariableToLoadOption (OptionName, &mBmHotkeyBootOption); - DEBUG ((EFI_D_INFO, "[Bds]Hotkey for %s pressed - %r\n", OptionName, Status)); + DEBUG ((DEBUG_INFO, "[Bds]Hotkey for %s pressed - %r\n", OptionName, Status)); if (EFI_ERROR (Status)) { mBmHotkeyBootOption.OptionNumber = LoadOptionNumberUnassigned; } } else { - DEBUG ((EFI_D_INFO, "[Bds]Continue key pressed!\n")); + DEBUG ((DEBUG_INFO, "[Bds]Continue key pressed!\n")); } } } else { @@ -503,7 +503,7 @@ BmUnregisterHotkeyNotify ( ); if (!EFI_ERROR (Status)) { Status = TxtInEx->UnregisterKeyNotify (TxtInEx, NotifyHandle); - DEBUG ((EFI_D_INFO, "[Bds]UnregisterKeyNotify: %04x/%04x %r\n", Hotkey->KeyData[KeyIndex].Key.ScanCode, Hotkey->KeyData[KeyIndex].Key.UnicodeChar, Status)); + DEBUG ((DEBUG_INFO, "[Bds]UnregisterKeyNotify: %04x/%04x %r\n", Hotkey->KeyData[KeyIndex].Key.ScanCode, Hotkey->KeyData[KeyIndex].Key.UnicodeChar, Status)); } } } @@ -542,7 +542,7 @@ BmRegisterHotkeyNotify ( &NotifyHandle ); DEBUG (( - EFI_D_INFO, + DEBUG_INFO, "[Bds]RegisterKeyNotify: %04x/%04x %08x/%02x %r\n", Hotkey->KeyData[Index].Key.ScanCode, Hotkey->KeyData[Index].Key.UnicodeChar, @@ -830,7 +830,7 @@ BmStopHotkeyService ( LIST_ENTRY *Link; BM_HOTKEY *Hotkey; - DEBUG ((EFI_D_INFO, "[Bds]Stop Hotkey Service!\n")); + DEBUG ((DEBUG_INFO, "[Bds]Stop Hotkey Service!\n")); gBS->CloseEvent (Event); EfiAcquireLock (&mBmHotkeyLock); @@ -873,7 +873,7 @@ EfiBootManagerStartHotkeyService ( } if (mBmHotkeySupportCount == 0) { - DEBUG ((EFI_D_INFO, "Bds: BootOptionSupport NV variable forbids starting the hotkey service.\n")); + DEBUG ((DEBUG_INFO, "Bds: BootOptionSupport NV variable forbids starting the hotkey service.\n")); return EFI_UNSUPPORTED; } diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index 89372b3b97..30a6c840aa 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -1081,7 +1081,7 @@ EfiBootManagerGetLoadOptions ( Status = EfiBootManagerVariableToLoadOption (OptionName, &Options[OptionIndex]); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "[Bds] %s doesn't exist - Update ****Order variable to remove the reference!!", OptionName)); + DEBUG ((DEBUG_INFO, "[Bds] %s doesn't exist - Update ****Order variable to remove the reference!!", OptionName)); EfiBootManagerDeleteLoadOptionVariable (OptionNumber, LoadOptionType); } else { ASSERT (Options[OptionIndex].OptionNumber == OptionNumber); diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c index 89595747af..6e7af3e3d9 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c @@ -208,9 +208,9 @@ BmSetMemoryTypeInformationVariable ( // // Use a heuristic to adjust the Memory Type Information for the next boot // - DEBUG ((EFI_D_INFO, "Memory Previous Current Next \n")); - DEBUG ((EFI_D_INFO, " Type Pages Pages Pages \n")); - DEBUG ((EFI_D_INFO, "====== ======== ======== ========\n")); + DEBUG ((DEBUG_INFO, "Memory Previous Current Next \n")); + DEBUG ((DEBUG_INFO, " Type Pages Pages Pages \n")); + DEBUG ((DEBUG_INFO, "====== ======== ======== ========\n")); for (Index = 0; PreviousMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) { @@ -253,7 +253,7 @@ BmSetMemoryTypeInformationVariable ( MemoryTypeInformationModified = TRUE; } - DEBUG ((EFI_D_INFO, " %02x %08x %08x %08x\n", PreviousMemoryTypeInformation[Index].Type, Previous, Current, Next)); + DEBUG ((DEBUG_INFO, " %02x %08x %08x %08x\n", PreviousMemoryTypeInformation[Index].Type, Previous, Current, Next)); } // @@ -276,14 +276,14 @@ BmSetMemoryTypeInformationVariable ( // entry/resume cycle will not fail. // if (MemoryTypeInformationModified) { - DEBUG ((EFI_D_INFO, "Memory Type Information settings change.\n")); + DEBUG ((DEBUG_INFO, "Memory Type Information settings change.\n")); if (Boot && PcdGetBool (PcdResetOnMemoryTypeInformationChange)) { - DEBUG ((EFI_D_INFO, "...Warm Reset!!!\n")); + DEBUG ((DEBUG_INFO, "...Warm Reset!!!\n")); gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL); } } } else { - DEBUG ((EFI_D_ERROR, "Memory Type Information settings cannot be saved. OS S4 may fail!\n")); + DEBUG ((DEBUG_ERROR, "Memory Type Information settings cannot be saved. OS S4 may fail!\n")); } } FreePool (PreviousMemoryTypeInformation); @@ -385,7 +385,7 @@ BmPrintDp ( CHAR16 *Str; Str = ConvertDevicePathToText (DevicePath, FALSE, FALSE); - DEBUG ((EFI_D_INFO, "%s", Str)); + DEBUG ((DEBUG_INFO, "%s", Str)); if (Str != NULL) { FreePool (Str); } -- cgit v1.2.3