MdeModulePkg/VarCheckHiiLib: Replace EFI_D_INFO with DEBUG_INFO

In patch 2, we will introduce DEBUG_INFO in VarCheckHiiLib,in order to keep
consistence, replace all EFI_D_INFO with DEBUG_INFO firstly in this pacth.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

4 files changed, 126 insertions, 126 deletions

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
index 2c3b9eb8e4..0e91e98219 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
@@ -123,8 +123,8 @@ DumpHiiPackage (
 

   HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiPackage;

 

-  DEBUG ((EFI_D_INFO, "  HiiPackageHeader->Type   - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));

-  DEBUG ((EFI_D_INFO, "  HiiPackageHeader->Length - 0x%06x\n", HiiPackageHeader->Length));

+  DEBUG ((DEBUG_INFO, "  HiiPackageHeader->Type   - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));

+  DEBUG ((DEBUG_INFO, "  HiiPackageHeader->Length - 0x%06x\n", HiiPackageHeader->Length));

 

   switch (HiiPackageHeader->Type) {

     case EFI_HII_PACKAGE_FORMS:

@@ -134,26 +134,26 @@ DumpHiiPackage (
         switch (IfrOpCodeHeader->OpCode) {

           case EFI_IFR_VARSTORE_OP:

             IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpCodeHeader;

-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));

-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

-            DEBUG ((EFI_D_INFO, "      Guid       - %g\n", &IfrVarStore->Guid));

-            DEBUG ((EFI_D_INFO, "      VarStoreId - 0x%04x\n", IfrVarStore->VarStoreId));

-            DEBUG ((EFI_D_INFO, "      Size       - 0x%04x\n", IfrVarStore->Size));

-            DEBUG ((EFI_D_INFO, "      Name       - %a\n", IfrVarStore->Name));

+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));

+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

+            DEBUG ((DEBUG_INFO, "      Guid       - %g\n", &IfrVarStore->Guid));

+            DEBUG ((DEBUG_INFO, "      VarStoreId - 0x%04x\n", IfrVarStore->VarStoreId));

+            DEBUG ((DEBUG_INFO, "      Size       - 0x%04x\n", IfrVarStore->Size));

+            DEBUG ((DEBUG_INFO, "      Name       - %a\n", IfrVarStore->Name));

             break;

 

           case EFI_IFR_VARSTORE_EFI_OP:

             IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpCodeHeader;

             if (IfrEfiVarStore->Header.Length >= sizeof (EFI_IFR_VARSTORE_EFI)) {

-              DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

-              DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));

-              DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

-              DEBUG ((EFI_D_INFO, "      Guid       - %g\n", &IfrEfiVarStore->Guid));

-              DEBUG ((EFI_D_INFO, "      VarStoreId - 0x%04x\n", IfrEfiVarStore->VarStoreId));

-              DEBUG ((EFI_D_INFO, "      Size       - 0x%04x\n", IfrEfiVarStore->Size));

-              DEBUG ((EFI_D_INFO, "      Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));

-              DEBUG ((EFI_D_INFO, "      Name       - %a\n", IfrEfiVarStore->Name));

+              DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

+              DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));

+              DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

+              DEBUG ((DEBUG_INFO, "      Guid       - %g\n", &IfrEfiVarStore->Guid));

+              DEBUG ((DEBUG_INFO, "      VarStoreId - 0x%04x\n", IfrEfiVarStore->VarStoreId));

+              DEBUG ((DEBUG_INFO, "      Size       - 0x%04x\n", IfrEfiVarStore->Size));

+              DEBUG ((DEBUG_INFO, "      Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));

+              DEBUG ((DEBUG_INFO, "      Name       - %a\n", IfrEfiVarStore->Name));

             }

             break;

 

@@ -161,14 +161,14 @@ DumpHiiPackage (
           case EFI_IFR_CHECKBOX_OP:

           case EFI_IFR_NUMERIC_OP:

           case EFI_IFR_ORDERED_LIST_OP:

-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));

-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

-            DEBUG ((EFI_D_INFO, "      Prompt       - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt));

-            DEBUG ((EFI_D_INFO, "      Help         - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help));

-            DEBUG ((EFI_D_INFO, "      QuestionId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.QuestionId));

-            DEBUG ((EFI_D_INFO, "      VarStoreId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId));

-            DEBUG ((EFI_D_INFO, "      VarStoreInfo - 0x%04x\n", ((EFI_IFR_ONE_OF * )IfrOpCodeHeader)->Question.VarStoreInfo.VarOffset));

+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));

+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

+            DEBUG ((DEBUG_INFO, "      Prompt       - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt));

+            DEBUG ((DEBUG_INFO, "      Help         - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help));

+            DEBUG ((DEBUG_INFO, "      QuestionId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.QuestionId));

+            DEBUG ((DEBUG_INFO, "      VarStoreId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId));

+            DEBUG ((DEBUG_INFO, "      VarStoreInfo - 0x%04x\n", ((EFI_IFR_ONE_OF * )IfrOpCodeHeader)->Question.VarStoreInfo.VarOffset));

             {

               EFI_IFR_ONE_OF            *IfrOneOf;

               EFI_IFR_CHECKBOX          *IfrCheckBox;

@@ -178,64 +178,64 @@ DumpHiiPackage (
               switch (IfrOpCodeHeader->OpCode) {

                 case EFI_IFR_ONE_OF_OP:

                   IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpCodeHeader;

-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrOneOf->Flags));

+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrOneOf->Flags));

                   switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {

                   case EFI_IFR_NUMERIC_SIZE_1:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%02x\n", IfrOneOf->data.u8.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%02x\n", IfrOneOf->data.u8.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%02x\n", IfrOneOf->data.u8.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%02x\n", IfrOneOf->data.u8.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%02x\n", IfrOneOf->data.u8.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%02x\n", IfrOneOf->data.u8.Step));

                     break;

                   case EFI_IFR_NUMERIC_SIZE_2:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%04x\n", IfrOneOf->data.u16.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%04x\n", IfrOneOf->data.u16.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%04x\n", IfrOneOf->data.u16.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%04x\n", IfrOneOf->data.u16.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%04x\n", IfrOneOf->data.u16.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%04x\n", IfrOneOf->data.u16.Step));

                     break;

                   case EFI_IFR_NUMERIC_SIZE_4:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%08x\n", IfrOneOf->data.u32.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%08x\n", IfrOneOf->data.u32.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%08x\n", IfrOneOf->data.u32.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%08x\n", IfrOneOf->data.u32.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%08x\n", IfrOneOf->data.u32.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%08x\n", IfrOneOf->data.u32.Step));

                     break;

                   case EFI_IFR_NUMERIC_SIZE_8:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%016lx\n", IfrOneOf->data.u64.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%016lx\n", IfrOneOf->data.u64.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%016lx\n", IfrOneOf->data.u64.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%016lx\n", IfrOneOf->data.u64.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%016lx\n", IfrOneOf->data.u64.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%016lx\n", IfrOneOf->data.u64.Step));

                     break;

                   }

                   break;

                 case EFI_IFR_CHECKBOX_OP:

                   IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpCodeHeader;

-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrCheckBox->Flags));

+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrCheckBox->Flags));

                   break;

                 case EFI_IFR_NUMERIC_OP:

                   IfrNumeric = (EFI_IFR_NUMERIC *) IfrOpCodeHeader;

-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrNumeric->Flags));

+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrNumeric->Flags));

                   switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {

                   case EFI_IFR_NUMERIC_SIZE_1:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%02x\n", IfrNumeric->data.u8.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%02x\n", IfrNumeric->data.u8.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%02x\n", IfrNumeric->data.u8.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%02x\n", IfrNumeric->data.u8.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%02x\n", IfrNumeric->data.u8.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%02x\n", IfrNumeric->data.u8.Step));

                     break;

                   case EFI_IFR_NUMERIC_SIZE_2:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%04x\n", IfrNumeric->data.u16.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%04x\n", IfrNumeric->data.u16.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%04x\n", IfrNumeric->data.u16.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%04x\n", IfrNumeric->data.u16.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%04x\n", IfrNumeric->data.u16.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%04x\n", IfrNumeric->data.u16.Step));

                     break;

                   case EFI_IFR_NUMERIC_SIZE_4:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%08x\n", IfrNumeric->data.u32.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%08x\n", IfrNumeric->data.u32.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%08x\n", IfrNumeric->data.u32.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%08x\n", IfrNumeric->data.u32.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%08x\n", IfrNumeric->data.u32.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%08x\n", IfrNumeric->data.u32.Step));

                     break;

                   case EFI_IFR_NUMERIC_SIZE_8:

-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%016lx\n", IfrNumeric->data.u64.MinValue));

-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%016lx\n", IfrNumeric->data.u64.MaxValue));

-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%016lx\n", IfrNumeric->data.u64.Step));

+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%016lx\n", IfrNumeric->data.u64.MinValue));

+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%016lx\n", IfrNumeric->data.u64.MaxValue));

+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%016lx\n", IfrNumeric->data.u64.Step));

                     break;

                   }

                   break;

                 case EFI_IFR_ORDERED_LIST_OP:

                   IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpCodeHeader;

-                  DEBUG ((EFI_D_INFO, "      MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));

-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrOrderedList->Flags));

+                  DEBUG ((DEBUG_INFO, "      MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));

+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrOrderedList->Flags));

                   break;

                 default:

                   break;

@@ -251,26 +251,26 @@ DumpHiiPackage (
                   switch (IfrOpCodeHeader->OpCode) {

                     case EFI_IFR_ONE_OF_OPTION_OP:

                       IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *)IfrOpCodeHeader;

-                      DEBUG ((EFI_D_INFO, "!!!!    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

-                      DEBUG ((EFI_D_INFO, "!!!!    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

-                      DEBUG ((EFI_D_INFO, "!!!!      Option                - 0x%04x\n", IfrOneOfOption->Option));

-                      DEBUG ((EFI_D_INFO, "!!!!      Flags                 - 0x%02x\n", IfrOneOfOption->Flags));

-                      DEBUG ((EFI_D_INFO, "!!!!      Type                  - 0x%02x\n", IfrOneOfOption->Type));

+                      DEBUG ((DEBUG_INFO, "!!!!    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));

+                      DEBUG ((DEBUG_INFO, "!!!!    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));

+                      DEBUG ((DEBUG_INFO, "!!!!      Option                - 0x%04x\n", IfrOneOfOption->Option));

+                      DEBUG ((DEBUG_INFO, "!!!!      Flags                 - 0x%02x\n", IfrOneOfOption->Flags));

+                      DEBUG ((DEBUG_INFO, "!!!!      Type                  - 0x%02x\n", IfrOneOfOption->Type));

                       switch (IfrOneOfOption->Type) {

                         case EFI_IFR_TYPE_NUM_SIZE_8:

-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.u8));

+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.u8));

                           break;

                         case EFI_IFR_TYPE_NUM_SIZE_16:

-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%04x\n", IfrOneOfOption->Value.u16));

+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%04x\n", IfrOneOfOption->Value.u16));

                           break;

                         case EFI_IFR_TYPE_NUM_SIZE_32:

-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%08x\n", IfrOneOfOption->Value.u32));

+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%08x\n", IfrOneOfOption->Value.u32));

                           break;

                         case EFI_IFR_TYPE_NUM_SIZE_64:

-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%016lx\n", IfrOneOfOption->Value.u64));

+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%016lx\n", IfrOneOfOption->Value.u64));

                           break;

                         case EFI_IFR_TYPE_BOOLEAN:

-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.b));

+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.b));

                           break;

                         default:

                           break;

@@ -318,12 +318,12 @@ DumpHiiDatabase (
   EFI_HII_PACKAGE_LIST_HEADER   *HiiPackageListHeader;

   EFI_HII_PACKAGE_HEADER        *HiiPackageHeader;

 

-  DEBUG ((EFI_D_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));

+  DEBUG ((DEBUG_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));

   HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) HiiDatabase;

 

   while ((UINTN) HiiPackageListHeader < ((UINTN) HiiDatabase + HiiDatabaseSize)) {

-    DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &HiiPackageListHeader->PackageListGuid));

-    DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageLength   - 0x%x\n", (UINTN)HiiPackageListHeader->PackageLength));

+    DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &HiiPackageListHeader->PackageListGuid));

+    DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageLength   - 0x%x\n", (UINTN)HiiPackageListHeader->PackageLength));

     HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)(HiiPackageListHeader + 1);

 

     while ((UINTN) HiiPackageHeader < (UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength) {

@@ -505,7 +505,7 @@ MergeHiiQuestion (
 

   switch (HiiQuestion1->OpCode) {

     case EFI_IFR_ONE_OF_OP:

-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

       //

       // Get the length of Hii Question 1.

       //

@@ -586,11 +586,11 @@ MergeHiiQuestion (
       break;

 

     case EFI_IFR_CHECKBOX_OP:

-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

       break;

 

     case EFI_IFR_NUMERIC_OP:

-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

       //

       // Get minimum and maximum of Hii Question 1.

       //

@@ -630,7 +630,7 @@ MergeHiiQuestion (
       break;

 

     case EFI_IFR_ORDERED_LIST_OP:

-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));

       //

       // Get the length of Hii Question 1.

       //

@@ -1403,7 +1403,7 @@ BuildVarCheckHiiBin (
     BinSize += HiiVariableLength;

   }

 

-  DEBUG ((EFI_D_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));

+  DEBUG ((DEBUG_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));

   if (BinSize == 0) {

     *Size = BinSize;

     return NULL;

@@ -1416,7 +1416,7 @@ BuildVarCheckHiiBin (
   //

   Data = AllocateRuntimeZeroPool (BinSize);

   ASSERT (Data != NULL);

-  DEBUG ((EFI_D_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));

+  DEBUG ((DEBUG_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));

 

   //

   // Gen Data

@@ -1465,7 +1465,7 @@ VarCheckHiiGen (
 

   mVarCheckHiiBin = BuildVarCheckHiiBin (&mVarCheckHiiBinSize);

   if (mVarCheckHiiBin == NULL) {

-    DEBUG ((EFI_D_INFO, "[VarCheckHii] This driver could be removed from *.dsc and *.fdf\n"));

+    DEBUG ((DEBUG_INFO, "[VarCheckHii] This driver could be removed from *.dsc and *.fdf\n"));

     return;

   }

 

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
index 71ece272e1..78663503be 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
@@ -219,8 +219,8 @@ ParseFfs (
                         &AuthenticationStatus

                         );

         if (!EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_INFO, "FfsNameGuid - %g\n", DriverGuid));

-          DEBUG ((EFI_D_INFO, "NumberofMatchingVfrBin - 0x%02x\n", NumberofMatchingVfrBin));

+          DEBUG ((DEBUG_INFO , "FfsNameGuid - %g\n", DriverGuid));

+          DEBUG ((DEBUG_INFO , "NumberofMatchingVfrBin - 0x%02x\n", NumberofMatchingVfrBin));

 

           for (VfrBinIndex = 0; VfrBinIndex < NumberofMatchingVfrBin; VfrBinIndex++) {

 #ifdef DUMP_HII_DATA

@@ -284,7 +284,7 @@ ParseFv (
   // Search all FVs

   //

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

-    DEBUG ((EFI_D_INFO, "FvIndex - %x\n", Index));

+    DEBUG ((DEBUG_INFO , "FvIndex - %x\n", Index));

     Status = gBS->HandleProtocol (

                     HandleBuffer[Index],

                     &gEfiFirmwareVolume2ProtocolGuid,

@@ -305,9 +305,9 @@ ParseFv (
       ASSERT_EFI_ERROR (Status);

       Status = Fvb2->GetPhysicalAddress (Fvb2, &FvAddress);

       if (!EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_INFO, "FvAddress - 0x%08x\n", FvAddress));

+        DEBUG ((DEBUG_INFO , "FvAddress - 0x%08x\n", FvAddress));

         FvSize = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvLength;

-        DEBUG ((EFI_D_INFO, "FvSize    - 0x%08x\n", FvSize));

+        DEBUG ((DEBUG_INFO , "FvSize    - 0x%08x\n", FvSize));

       }

     );

 

@@ -373,7 +373,7 @@ CreateVfrDriverList (
   VAR_CHECK_VFR_DRIVER_INFO     *VfrDriverInfo;

 

   for (Index = 0; !IsZeroGuid (&DriverGuidArray[Index]); Index++) {

-     DEBUG ((EFI_D_INFO, "CreateVfrDriverList: %g\n", &DriverGuidArray[Index]));

+     DEBUG ((DEBUG_INFO , "CreateVfrDriverList: %g\n", &DriverGuidArray[Index]));

      VfrDriverInfo = InternalVarCheckAllocateZeroPool (sizeof (*VfrDriverInfo));

      ASSERT (VfrDriverInfo != NULL);

      VfrDriverInfo->Signature = VAR_CHECK_VFR_DRIVER_INFO_SIGNATURE;

@@ -414,7 +414,7 @@ VarCheckHiiGenFromFv (
   EFI_GUID      *DriverGuidArray;

   BOOLEAN       ScanAll;

 

-  DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromFv\n"));

+  DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromFv\n"));

 

   //

   // Get vfr driver guid array from PCD.

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
index 41cde34af7..de2de48634 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
@@ -58,7 +58,7 @@ VarCheckHiiGenFromHiiDatabase (
     Status = HiiDatabase->ExportPackageLists (HiiDatabase, 0, &BufferSize, Buffer);

     ASSERT_EFI_ERROR (Status);

 

-    DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromHii - HII Database exported at 0x%x, size = 0x%x\n", Buffer, BufferSize));

+    DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromHii - HII Database exported at 0x%x, size = 0x%x\n", Buffer, BufferSize));

 

 #ifdef DUMP_HII_DATA

     DEBUG_CODE (

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
index 93ff9340e9..46a93bdb8a 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
@@ -60,7 +60,7 @@ VarCheckHiiInternalDumpHex (
 

     Val[Index * 3]  = 0;

     Str[Index]      = 0;

-    DEBUG ((EFI_D_INFO, "%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str));

+    DEBUG ((DEBUG_INFO , "%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str));

 

     Data += Size;

     Offset += Size;

@@ -95,7 +95,7 @@ VarCheckHiiQuestion (
   UINT8    MaxContainers;

 

   if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth) > DataSize) {

-    DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, DataSize));

+    DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, DataSize));

     return FALSE;

   }

 

@@ -120,7 +120,7 @@ VarCheckHiiQuestion (
         //

         // No match

         //

-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: OneOf mismatch (0x%lx)\n", OneData));

+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OneOf mismatch (0x%lx)\n", OneData));

         DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););

         return FALSE;

       }

@@ -128,7 +128,7 @@ VarCheckHiiQuestion (
 

     case EFI_IFR_CHECKBOX_OP:

       if ((OneData != 0) && (OneData != 1)) {

-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: CheckBox mismatch (0x%lx)\n", OneData));

+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: CheckBox mismatch (0x%lx)\n", OneData));

         DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););

         return FALSE;

       }

@@ -147,7 +147,7 @@ VarCheckHiiQuestion (
       // No need to check Step, because it is ONLY for UI.

       //

       if ((OneData < Minimum) || (OneData > Maximum)) {

-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: Numeric mismatch (0x%lx)\n", OneData));

+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: Numeric mismatch (0x%lx)\n", OneData));

         DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););

         return FALSE;

       }

@@ -156,7 +156,7 @@ VarCheckHiiQuestion (
     case EFI_IFR_ORDERED_LIST_OP:

       MaxContainers = ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers;

       if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth * MaxContainers) > DataSize) {

-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize));

+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize));

         return FALSE;

       }

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

@@ -185,7 +185,7 @@ VarCheckHiiQuestion (
           //

           // No match

           //

-          DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: OrderedList mismatch\n"));

+          DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OrderedList mismatch\n"));

           DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->StorageWidth * MaxContainers, (UINT8 *) Data + HiiQuestion->VarOffset););

           DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););

           return FALSE;

@@ -251,19 +251,19 @@ SetVariableCheckHandlerHii (
       //

       // Found the Hii Variable that could be used to do check.

       //

-      DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - %s:%g with Attributes = 0x%08x Size = 0x%x\n", VariableName, VendorGuid, Attributes, DataSize));

+      DEBUG ((DEBUG_INFO , "VarCheckHiiVariable - %s:%g with Attributes = 0x%08x Size = 0x%x\n", VariableName, VendorGuid, Attributes, DataSize));

       if (HiiVariable->Attributes != Attributes) {

-        DEBUG ((EFI_D_INFO, "VarCheckHiiVariable fail for Attributes - 0x%08x\n", HiiVariable->Attributes));

+        DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Attributes - 0x%08x\n", HiiVariable->Attributes));

         return EFI_SECURITY_VIOLATION;

       }

 

       if (DataSize == 0) {

-        DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - CHECK PASS with DataSize == 0 !\n"));

+        DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - CHECK PASS with DataSize == 0 !\n"));

         return EFI_SUCCESS;

       }

 

       if (HiiVariable->Size != DataSize) {

-        DEBUG ((EFI_D_INFO, "VarCheckHiiVariable fail for Size - 0x%x\n", HiiVariable->Size));

+        DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Size - 0x%x\n", HiiVariable->Size));

         return EFI_SECURITY_VIOLATION;

       }

 

@@ -282,7 +282,7 @@ SetVariableCheckHandlerHii (
         HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiQuestion + HiiQuestion->Length));

       }

 

-      DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - ALL CHECK PASS!\n"));

+      DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - ALL CHECK PASS!\n"));

       return EFI_SUCCESS;

     }

     //

@@ -343,11 +343,11 @@ DumpHiiQuestion (
   UINT64    OneValue;

   UINT8     *Ptr;

 

-  DEBUG ((EFI_D_INFO, "  VAR_CHECK_HII_QUESTION_HEADER\n"));

-  DEBUG ((EFI_D_INFO, "    OpCode        - 0x%02x (%a)\n", HiiQuestion->OpCode, HiiOpCodeToStr (HiiQuestion->OpCode)));

-  DEBUG ((EFI_D_INFO, "    Length        - 0x%02x\n", HiiQuestion->Length));

-  DEBUG ((EFI_D_INFO, "    VarOffset     - 0x%04x\n", HiiQuestion->VarOffset));

-  DEBUG ((EFI_D_INFO, "    StorageWidth  - 0x%02x\n", HiiQuestion->StorageWidth));

+  DEBUG ((DEBUG_INFO, "  VAR_CHECK_HII_QUESTION_HEADER\n"));

+  DEBUG ((DEBUG_INFO, "    OpCode        - 0x%02x (%a)\n", HiiQuestion->OpCode, HiiOpCodeToStr (HiiQuestion->OpCode)));

+  DEBUG ((DEBUG_INFO, "    Length        - 0x%02x\n", HiiQuestion->Length));

+  DEBUG ((DEBUG_INFO, "    VarOffset     - 0x%04x\n", HiiQuestion->VarOffset));

+  DEBUG ((DEBUG_INFO, "    StorageWidth  - 0x%02x\n", HiiQuestion->StorageWidth));

 

   switch (HiiQuestion->OpCode) {

     case EFI_IFR_ONE_OF_OP:

@@ -357,16 +357,16 @@ DumpHiiQuestion (
         CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);

         switch (HiiQuestion->StorageWidth) {

           case sizeof (UINT8):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%02x\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%02x\n", OneValue));

             break;

           case sizeof (UINT16):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%04x\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%04x\n", OneValue));

             break;

           case sizeof (UINT32):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%08x\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%08x\n", OneValue));

             break;

           case sizeof (UINT64):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));

             break;

           default:

             ASSERT (FALSE);

@@ -390,20 +390,20 @@ DumpHiiQuestion (
 

       switch (HiiQuestion->StorageWidth) {

         case sizeof (UINT8):

-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%02x\n", Minimum));

-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%02x\n", Maximum));

+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%02x\n", Minimum));

+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%02x\n", Maximum));

           break;

         case sizeof (UINT16):

-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%04x\n", Minimum));

-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%04x\n", Maximum));

+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%04x\n", Minimum));

+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%04x\n", Maximum));

           break;

         case sizeof (UINT32):

-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%08x\n", Minimum));

-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%08x\n", Maximum));

+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%08x\n", Minimum));

+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%08x\n", Maximum));

           break;

         case sizeof (UINT64):

-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%016lx\n", Minimum));

-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%016lx\n", Maximum));

+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%016lx\n", Minimum));

+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%016lx\n", Maximum));

           break;

         default:

           ASSERT (FALSE);

@@ -412,23 +412,23 @@ DumpHiiQuestion (
       break;

 

     case EFI_IFR_ORDERED_LIST_OP:

-      DEBUG ((EFI_D_INFO, "    MaxContainers - 0x%02x\n", ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers));

+      DEBUG ((DEBUG_INFO, "    MaxContainers - 0x%02x\n", ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers));

       Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion + 1);

       while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) {

         OneValue = 0;

         CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);

         switch (HiiQuestion->StorageWidth) {

           case sizeof (UINT8):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%02x\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%02x\n", OneValue));

             break;

           case sizeof (UINT16):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%04x\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%04x\n", OneValue));

             break;

           case sizeof (UINT32):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%08x\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%08x\n", OneValue));

             break;

           case sizeof (UINT64):

-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));

+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));

             break;

           default:

             ASSERT (FALSE);

@@ -457,15 +457,15 @@ DumpHiiVariable (
 {

   VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;

 

-  DEBUG ((EFI_D_INFO, "VAR_CHECK_HII_VARIABLE_HEADER\n"));

-  DEBUG ((EFI_D_INFO, "  Revision        - 0x%04x\n", HiiVariable->Revision));

-  DEBUG ((EFI_D_INFO, "  HeaderLength    - 0x%04x\n", HiiVariable->HeaderLength));

-  DEBUG ((EFI_D_INFO, "  Length          - 0x%08x\n", HiiVariable->Length));

-  DEBUG ((EFI_D_INFO, "  OpCode          - 0x%02x (%a)\n", HiiVariable->OpCode, HiiOpCodeToStr (HiiVariable->OpCode)));

-  DEBUG ((EFI_D_INFO, "  Size            - 0x%04x\n", HiiVariable->Size));

-  DEBUG ((EFI_D_INFO, "  Attributes      - 0x%08x\n", HiiVariable->Attributes));

-  DEBUG ((EFI_D_INFO, "  Guid            - %g\n", &HiiVariable->Guid));

-  DEBUG ((EFI_D_INFO, "  Name            - %s\n", HiiVariable + 1));

+  DEBUG ((DEBUG_INFO, "VAR_CHECK_HII_VARIABLE_HEADER\n"));

+  DEBUG ((DEBUG_INFO, "  Revision        - 0x%04x\n", HiiVariable->Revision));

+  DEBUG ((DEBUG_INFO, "  HeaderLength    - 0x%04x\n", HiiVariable->HeaderLength));

+  DEBUG ((DEBUG_INFO, "  Length          - 0x%08x\n", HiiVariable->Length));

+  DEBUG ((DEBUG_INFO, "  OpCode          - 0x%02x (%a)\n", HiiVariable->OpCode, HiiOpCodeToStr (HiiVariable->OpCode)));

+  DEBUG ((DEBUG_INFO, "  Size            - 0x%04x\n", HiiVariable->Size));

+  DEBUG ((DEBUG_INFO, "  Attributes      - 0x%08x\n", HiiVariable->Attributes));

+  DEBUG ((DEBUG_INFO, "  Guid            - %g\n", &HiiVariable->Guid));

+  DEBUG ((DEBUG_INFO, "  Name            - %s\n", HiiVariable + 1));

 

   //

   // For Hii Question header align.

@@ -498,7 +498,7 @@ DumpVarCheckHii (
 {

   VAR_CHECK_HII_VARIABLE_HEADER     *HiiVariable;

 

-  DEBUG ((EFI_D_INFO, "DumpVarCheckHii\n"));

+  DEBUG ((DEBUG_INFO, "DumpVarCheckHii\n"));

 

   //

   // For Hii Variable header align.