MdeModulePkg/SmmLockBoxLib: Use 'DEBUG_' prefix instead of 'EFI_D_'

This commit is out of the scope for BZ-1409. It is a coding style
refinement for the SmmLockBoxLib.

More specifically, the commit will remove all the debug message display
level macros starting with 'EFI_D_' and replace them with macros starting
with 'DEBUG_'.

Cc: Jian J Wang <jian.j.wang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
index ac8bcd2ff790a64d3e8de65d3bd981918f9140f2..0428decbacd1cd592a127384cd3e41d6d25aff19 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -153,7 +153,7 @@ SaveLockBox (
   UINT8                           *CommBuffer;\r
   UINTN                           CommSize;\r
 \r
   UINT8                           *CommBuffer;\r
   UINTN                           CommSize;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n"));\r

 \r
   //\r
   // Basic check\r
 \r
   //\r
   // Basic check\r


@@ -199,7 +199,7 @@ SaveLockBox (
 \r
   Status = (EFI_STATUS)LockBoxParameterSave->Header.ReturnStatus;\r
 \r
 \r
   Status = (EFI_STATUS)LockBoxParameterSave->Header.ReturnStatus;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SaveLockBox - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r


@@ -235,7 +235,7 @@ SetLockBoxAttributes (
   UINT8                                     *CommBuffer;\r
   UINTN                                     CommSize;\r
 \r
   UINT8                                     *CommBuffer;\r
   UINTN                                     CommSize;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Enter\n"));\r

 \r
   //\r
   // Basic check\r
 \r
   //\r
   // Basic check\r


@@ -281,7 +281,7 @@ SetLockBoxAttributes (
 \r
   Status = (EFI_STATUS)LockBoxParameterSetAttributes->Header.ReturnStatus;\r
 \r
 \r
   Status = (EFI_STATUS)LockBoxParameterSetAttributes->Header.ReturnStatus;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r


@@ -322,7 +322,7 @@ UpdateLockBox (
   UINT8                             *CommBuffer;\r
   UINTN                             CommSize;\r
 \r
   UINT8                             *CommBuffer;\r
   UINTN                             CommSize;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n"));\r

 \r
   //\r
   // Basic check\r
 \r
   //\r
   // Basic check\r


@@ -369,7 +369,7 @@ UpdateLockBox (
 \r
   Status = (EFI_STATUS)LockBoxParameterUpdate->Header.ReturnStatus;\r
 \r
 \r
   Status = (EFI_STATUS)LockBoxParameterUpdate->Header.ReturnStatus;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib UpdateLockBox - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r


@@ -411,7 +411,7 @@ RestoreLockBox (
   UINT8                              *CommBuffer;\r
   UINTN                              CommSize;\r
 \r
   UINT8                              *CommBuffer;\r
   UINTN                              CommSize;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n"));\r

 \r
   //\r
   // Basic check\r
 \r
   //\r
   // Basic check\r


@@ -467,7 +467,7 @@ RestoreLockBox (
 \r
   Status = (EFI_STATUS)LockBoxParameterRestore->Header.ReturnStatus;\r
 \r
 \r
   Status = (EFI_STATUS)LockBoxParameterRestore->Header.ReturnStatus;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreLockBox - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r


@@ -496,7 +496,7 @@ RestoreAllLockBoxInPlace (
   UINT8                                           *CommBuffer;\r
   UINTN                                           CommSize;\r
 \r
   UINT8                                           *CommBuffer;\r
   UINTN                                           CommSize;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Enter\n"));\r

 \r
   SmmCommunication = LockBoxGetSmmCommProtocol ();\r
   if (SmmCommunication == NULL) {\r
 \r
   SmmCommunication = LockBoxGetSmmCommProtocol ();\r
   if (SmmCommunication == NULL) {\r


@@ -532,7 +532,7 @@ RestoreAllLockBoxInPlace (
 \r
   Status = (EFI_STATUS)LockBoxParameterRestoreAllInPlace->Header.ReturnStatus;\r
 \r
 \r
   Status = (EFI_STATUS)LockBoxParameterRestoreAllInPlace->Header.ReturnStatus;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
index 8a168663c4af6cce42dab813a74d13b2130bb32e..9f734800709e7d80adb4efc2410db9139cbfc1a8 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -542,7 +542,7 @@ RestoreLockBox (
   // } EFI_SMM_COMMUNICATE_HEADER;\r
   //\r
 \r
   // } EFI_SMM_COMMUNICATE_HEADER;\r
   //\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Enter\n"));\r

 \r
   //\r
   // Basic check\r
 \r
   //\r
   // Basic check\r


@@ -563,9 +563,9 @@ RestoreLockBox (
              (VOID **)&SmmCommunicationPpi\r
              );\r
   if (EFI_ERROR (Status)) {\r
              (VOID **)&SmmCommunicationPpi\r
              );\r
   if (EFI_ERROR (Status)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n", Status));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n", Status));\r

     Status = InternalRestoreLockBoxFromSmram (Guid, Buffer, Length);\r
     Status = InternalRestoreLockBoxFromSmram (Guid, Buffer, Length);\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status));\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -581,13 +581,13 @@ RestoreLockBox (
     CommHeader->MessageLength = sizeof(*LockBoxParameterRestore);\r
   }\r
 \r
     CommHeader->MessageLength = sizeof(*LockBoxParameterRestore);\r
   }\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib CommBuffer - %x\n", &CommBuffer[0]));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib CommBuffer - %x\n", &CommBuffer[0]));\r

   if ((sizeof(UINTN) == sizeof(UINT32)) && (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) ) {\r
     LockBoxParameterRestore = (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&CommBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINT64)];\r
   } else {\r
     LockBoxParameterRestore = (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&CommBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINTN)];\r
   }\r
   if ((sizeof(UINTN) == sizeof(UINT32)) && (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) ) {\r
     LockBoxParameterRestore = (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&CommBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINT64)];\r
   } else {\r
     LockBoxParameterRestore = (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&CommBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINTN)];\r
   }\r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LockBoxParameterRestore - %x\n", LockBoxParameterRestore));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LockBoxParameterRestore - %x\n", LockBoxParameterRestore));\r

   LockBoxParameterRestore->Header.Command    = EFI_SMM_LOCK_BOX_COMMAND_RESTORE;\r
   LockBoxParameterRestore->Header.DataLength = sizeof(*LockBoxParameterRestore);\r
   LockBoxParameterRestore->Header.ReturnStatus = (UINT64)-1;\r
   LockBoxParameterRestore->Header.Command    = EFI_SMM_LOCK_BOX_COMMAND_RESTORE;\r
   LockBoxParameterRestore->Header.DataLength = sizeof(*LockBoxParameterRestore);\r
   LockBoxParameterRestore->Header.ReturnStatus = (UINT64)-1;\r


@@ -616,7 +616,7 @@ RestoreLockBox (
     //\r
     // Pei SMM communication not ready yet, so we access SMRAM directly\r
     //\r
     //\r
     // Pei SMM communication not ready yet, so we access SMRAM directly\r
     //\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n", Status));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n", Status));\r

     Status = InternalRestoreLockBoxFromSmram (Guid, Buffer, Length);\r
     LockBoxParameterRestore->Header.ReturnStatus = (UINT64)Status;\r
     if (Length != NULL) {\r
     Status = InternalRestoreLockBoxFromSmram (Guid, Buffer, Length);\r
     LockBoxParameterRestore->Header.ReturnStatus = (UINT64)Status;\r
     if (Length != NULL) {\r


@@ -635,7 +635,7 @@ RestoreLockBox (
     Status |= MAX_BIT;\r
   }\r
 \r
     Status |= MAX_BIT;\r
   }\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r


@@ -673,7 +673,7 @@ RestoreAllLockBoxInPlace (
   // } EFI_SMM_COMMUNICATE_HEADER;\r
   //\r
 \r
   // } EFI_SMM_COMMUNICATE_HEADER;\r
   //\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Enter\n"));\r

 \r
   //\r
   // Get needed resource\r
 \r
   //\r
   // Get needed resource\r


@@ -685,9 +685,9 @@ RestoreAllLockBoxInPlace (
              (VOID **)&SmmCommunicationPpi\r
              );\r
   if (EFI_ERROR (Status)) {\r
              (VOID **)&SmmCommunicationPpi\r
              );\r
   if (EFI_ERROR (Status)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n", Status));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n", Status));\r

     Status = InternalRestoreAllLockBoxInPlaceFromSmram ();\r
     Status = InternalRestoreAllLockBoxInPlaceFromSmram ();\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status));\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -725,7 +725,7 @@ RestoreAllLockBoxInPlace (
     //\r
     // Pei SMM communication not ready yet, so we access SMRAM directly\r
     //\r
     //\r
     // Pei SMM communication not ready yet, so we access SMRAM directly\r
     //\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n", Status));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n", Status));\r

     Status = InternalRestoreAllLockBoxInPlaceFromSmram ();\r
     LockBoxParameterRestoreAllInPlace->Header.ReturnStatus = (UINT64)Status;\r
   }\r
     Status = InternalRestoreAllLockBoxInPlaceFromSmram ();\r
     LockBoxParameterRestoreAllInPlace->Header.ReturnStatus = (UINT64)Status;\r
   }\r


@@ -737,7 +737,7 @@ RestoreAllLockBoxInPlace (
     Status |= MAX_BIT;\r
   }\r
 \r
     Status |= MAX_BIT;\r
   }\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status));\r

 \r
   //\r
   // Done\r
 \r
   //\r
   // Done\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
index 54a81d6521b74cb732001094b9df573538c40dc7..c912d187a4c6ef05c98da4b411f76cfa1b94a9da 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -214,7 +214,7 @@ SmmLockBoxSmmConstructor (
   EFI_STATUS           Status;\r
   SMM_LOCK_BOX_CONTEXT *SmmLockBoxContext;\r
 \r
   EFI_STATUS           Status;\r
   SMM_LOCK_BOX_CONTEXT *SmmLockBoxContext;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Enter\n"));\r

 \r
   //\r
   // Register SmmReadyToLock notification.\r
 \r
   //\r
   // Register SmmReadyToLock notification.\r


@@ -255,8 +255,8 @@ SmmLockBoxSmmConstructor (
     // Find it. That means some other library instance is already run.\r
     // No need to install again, just return.\r
     //\r
     // Find it. That means some other library instance is already run.\r
     // No need to install again, just return.\r
     //\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - already installed\n"));\r
-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n"));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - already installed\n"));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n"));\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -279,9 +279,9 @@ SmmLockBoxSmmConstructor (
   ASSERT_EFI_ERROR (Status);\r
   mSmmConfigurationTableInstalled = TRUE;\r
 \r
   ASSERT_EFI_ERROR (Status);\r
   mSmmConfigurationTableInstalled = TRUE;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - %x\n", (UINTN)&mSmmLockBoxContext));\r
-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib LockBoxDataAddress - %x\n", (UINTN)&mLockBoxQueue));\r
-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - %x\n", (UINTN)&mSmmLockBoxContext));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib LockBoxDataAddress - %x\n", (UINTN)&mLockBoxQueue));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n"));\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r


@@ -306,7 +306,7 @@ SmmLockBoxSmmDestructor (
 {\r
   EFI_STATUS            Status;\r
 \r
 {\r
   EFI_STATUS            Status;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmDestructor in %a module\n", gEfiCallerBaseName));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmDestructor in %a module\n", gEfiCallerBaseName));\r

 \r
   if (mSmmConfigurationTableInstalled) {\r
     Status = gSmst->SmmInstallConfigurationTable (\r
 \r
   if (mSmmConfigurationTableInstalled) {\r
     Status = gSmst->SmmInstallConfigurationTable (\r


@@ -316,7 +316,7 @@ SmmLockBoxSmmDestructor (
                       0\r
                       );\r
     ASSERT_EFI_ERROR (Status);\r
                       0\r
                       );\r
     ASSERT_EFI_ERROR (Status);\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib uninstall SmmLockBoxCommunication configuration table\n"));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib uninstall SmmLockBoxCommunication configuration table\n"));\r

   }\r
 \r
   if (mSmmLockBoxRegistrationSmmReadyToLock != NULL) {\r
   }\r
 \r
   if (mSmmLockBoxRegistrationSmmReadyToLock != NULL) {\r


@@ -438,13 +438,13 @@ SaveLockBox (
   EFI_STATUS                  Status;\r
   LIST_ENTRY                  *LockBoxQueue;\r
 \r
   EFI_STATUS                  Status;\r
   LIST_ENTRY                  *LockBoxQueue;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Enter\n"));\r

 \r
   //\r
   // Basic check\r
   //\r
   if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {\r
 \r
   //\r
   // Basic check\r
   //\r
   if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER));\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -453,7 +453,7 @@ SaveLockBox (
   //\r
   LockBox = InternalFindLockBoxByGuid (Guid);\r
   if (LockBox != NULL) {\r
   //\r
   LockBox = InternalFindLockBoxByGuid (Guid);\r
   if (LockBox != NULL) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_ALREADY_STARTED));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_ALREADY_STARTED));\r

     return EFI_ALREADY_STARTED;\r
   }\r
 \r
     return EFI_ALREADY_STARTED;\r
   }\r
 \r


@@ -468,7 +468,7 @@ SaveLockBox (
                     );\r
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r
                     );\r
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_OUT_OF_RESOURCES));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_OUT_OF_RESOURCES));\r

     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r


@@ -483,7 +483,7 @@ SaveLockBox (
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r
     gSmst->SmmFreePages (SmramBuffer, EFI_SIZE_TO_PAGES (Length));\r
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r
     gSmst->SmmFreePages (SmramBuffer, EFI_SIZE_TO_PAGES (Length));\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_OUT_OF_RESOURCES));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_OUT_OF_RESOURCES));\r

     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r


@@ -503,7 +503,7 @@ SaveLockBox (
   LockBox->SmramBuffer = SmramBuffer;\r
 \r
   DEBUG ((\r
   LockBox->SmramBuffer = SmramBuffer;\r
 \r
   DEBUG ((\r

-    EFI_D_INFO,\r
+    DEBUG_INFO,\r

     "LockBoxGuid - %g, SmramBuffer - 0x%lx, Length - 0x%lx\n",\r
     &LockBox->Guid,\r
     LockBox->SmramBuffer,\r
     "LockBoxGuid - %g, SmramBuffer - 0x%lx, Length - 0x%lx\n",\r
     &LockBox->Guid,\r
     LockBox->SmramBuffer,\r


@@ -517,7 +517,7 @@ SaveLockBox (
   //\r
   // Done\r
   //\r
   //\r
   // Done\r
   //\r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_SUCCESS));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_SUCCESS));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -543,22 +543,22 @@ SetLockBoxAttributes (
 {\r
   SMM_LOCK_BOX_DATA              *LockBox;\r
 \r
 {\r
   SMM_LOCK_BOX_DATA              *LockBox;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Enter\n"));\r

 \r
   //\r
   // Basic check\r
   //\r
   if ((Guid == NULL) ||\r
       ((Attributes & ~(LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE | LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY)) != 0)) {\r
 \r
   //\r
   // Basic check\r
   //\r
   if ((Guid == NULL) ||\r
       ((Attributes & ~(LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE | LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY)) != 0)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_INVALID_PARAMETER));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_INVALID_PARAMETER));\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) != 0) &&\r
       ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) != 0) &&\r
       ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_INVALID_PARAMETER));\r
-    DEBUG ((EFI_D_INFO, "  LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n"));\r
-    DEBUG ((EFI_D_INFO, "  can not be set together\n"));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_INVALID_PARAMETER));\r
+    DEBUG ((DEBUG_INFO, "  LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n"));\r
+    DEBUG ((DEBUG_INFO, "  can not be set together\n"));\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -567,7 +567,7 @@ SetLockBoxAttributes (
   //\r
   LockBox = InternalFindLockBoxByGuid (Guid);\r
   if (LockBox == NULL) {\r
   //\r
   LockBox = InternalFindLockBoxByGuid (Guid);\r
   if (LockBox == NULL) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_NOT_FOUND));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_NOT_FOUND));\r

     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r


@@ -575,9 +575,9 @@ SetLockBoxAttributes (
       ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0)) ||\r
       (((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) != 0) &&\r
       ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0))) {\r
       ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0)) ||\r
       (((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) != 0) &&\r
       ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0))) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes 0x%lx 0x%lx - Exit (%r)\n", LockBox->Attributes, Attributes, EFI_INVALID_PARAMETER));\r
-    DEBUG ((EFI_D_INFO, "  LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n"));\r
-    DEBUG ((EFI_D_INFO, "  can not be set together\n"));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes 0x%lx 0x%lx - Exit (%r)\n", LockBox->Attributes, Attributes, EFI_INVALID_PARAMETER));\r
+    DEBUG ((DEBUG_INFO, "  LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n"));\r
+    DEBUG ((DEBUG_INFO, "  can not be set together\n"));\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -589,7 +589,7 @@ SetLockBoxAttributes (
   //\r
   // Done\r
   //\r
   //\r
   // Done\r
   //\r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_SUCCESS));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_SUCCESS));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -620,13 +620,13 @@ UpdateLockBox (
 {\r
   SMM_LOCK_BOX_DATA             *LockBox;\r
 \r
 {\r
   SMM_LOCK_BOX_DATA             *LockBox;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Enter\n"));\r

 \r
   //\r
   // Basic check\r
   //\r
   if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {\r
 \r
   //\r
   // Basic check\r
   //\r
   if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER));\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -635,7 +635,7 @@ UpdateLockBox (
   //\r
   LockBox = InternalFindLockBoxByGuid (Guid);\r
   if (LockBox == NULL) {\r
   //\r
   LockBox = InternalFindLockBoxByGuid (Guid);\r
   if (LockBox == NULL) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_NOT_FOUND));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_NOT_FOUND));\r

     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r


@@ -643,7 +643,7 @@ UpdateLockBox (
   // Update data\r
   //\r
   if (LockBox->Length < Offset + Length) {\r
   // Update data\r
   //\r
   if (LockBox->Length < Offset + Length) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL));\r

     return EFI_BUFFER_TOO_SMALL;\r
   }\r
   ASSERT ((UINTN)LockBox->SmramBuffer <= (MAX_ADDRESS - Offset));\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
   ASSERT ((UINTN)LockBox->SmramBuffer <= (MAX_ADDRESS - Offset));\r


@@ -652,7 +652,7 @@ UpdateLockBox (
   //\r
   // Done\r
   //\r
   //\r
   // Done\r
   //\r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_SUCCESS));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_SUCCESS));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -685,7 +685,7 @@ RestoreLockBox (
   SMM_LOCK_BOX_DATA              *LockBox;\r
   VOID                           *RestoreBuffer;\r
 \r
   SMM_LOCK_BOX_DATA              *LockBox;\r
   VOID                           *RestoreBuffer;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Enter\n"));\r

 \r
   //\r
   // Restore this, Buffer and Length MUST be both NULL or both non-NULL\r
 \r
   //\r
   // Restore this, Buffer and Length MUST be both NULL or both non-NULL\r


@@ -693,7 +693,7 @@ RestoreLockBox (
   if ((Guid == NULL) ||\r
       ((Buffer == NULL) && (Length != NULL)) ||\r
       ((Buffer != NULL) && (Length == NULL))) {\r
   if ((Guid == NULL) ||\r
       ((Buffer == NULL) && (Length != NULL)) ||\r
       ((Buffer != NULL) && (Length == NULL))) {\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER));\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -705,7 +705,7 @@ RestoreLockBox (
     //\r
     // Not found\r
     //\r
     //\r
     // Not found\r
     //\r

-    DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_NOT_FOUND));\r
+    DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_NOT_FOUND));\r

     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r


@@ -732,7 +732,7 @@ RestoreLockBox (
     // restore to original buffer\r
     //\r
     if ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) == 0) {\r
     // restore to original buffer\r
     //\r
     if ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) == 0) {\r

-      DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_WRITE_PROTECTED));\r
+      DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_WRITE_PROTECTED));\r

       return EFI_WRITE_PROTECTED;\r
     }\r
     RestoreBuffer = (VOID *)(UINTN)LockBox->Buffer;\r
       return EFI_WRITE_PROTECTED;\r
     }\r
     RestoreBuffer = (VOID *)(UINTN)LockBox->Buffer;\r


@@ -747,7 +747,7 @@ RestoreLockBox (
       // Input buffer is too small to hold all data.\r
       //\r
       *Length = (UINTN)LockBox->Length;\r
       // Input buffer is too small to hold all data.\r
       //\r
       *Length = (UINTN)LockBox->Length;\r

-      DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL));\r
+      DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL));\r

       return EFI_BUFFER_TOO_SMALL;\r
     }\r
     *Length = (UINTN)LockBox->Length;\r
       return EFI_BUFFER_TOO_SMALL;\r
     }\r
     *Length = (UINTN)LockBox->Length;\r


@@ -761,7 +761,7 @@ RestoreLockBox (
   //\r
   // Done\r
   //\r
   //\r
   // Done\r
   //\r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_SUCCESS));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_SUCCESS));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -782,7 +782,7 @@ RestoreAllLockBoxInPlace (
   LIST_ENTRY                    *Link;\r
   LIST_ENTRY                    *LockBoxQueue;\r
 \r
   LIST_ENTRY                    *Link;\r
   LIST_ENTRY                    *LockBoxQueue;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Enter\n"));\r

 \r
   LockBoxQueue = InternalGetLockBoxQueue ();\r
   ASSERT (LockBoxQueue != NULL);\r
 \r
   LockBoxQueue = InternalGetLockBoxQueue ();\r
   ASSERT (LockBoxQueue != NULL);\r


@@ -808,7 +808,7 @@ RestoreAllLockBoxInPlace (
   //\r
   // Done\r
   //\r
   //\r
   // Done\r
   //\r

-  DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%r)\n", EFI_SUCCESS));\r
+  DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%r)\n", EFI_SUCCESS));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r