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>

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
index 2c3b9eb8e4c9f841acdcef1e8e79bc2bd778308f..0e91e982190a6d501503caee3dfc71e8d9c66e8d 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
@@ -123,8 +123,8 @@ DumpHiiPackage (
 \r
   HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiPackage;\r
 \r
-  DEBUG ((EFI_D_INFO, "  HiiPackageHeader->Type   - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));\r
-  DEBUG ((EFI_D_INFO, "  HiiPackageHeader->Length - 0x%06x\n", HiiPackageHeader->Length));\r
+  DEBUG ((DEBUG_INFO, "  HiiPackageHeader->Type   - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));\r
+  DEBUG ((DEBUG_INFO, "  HiiPackageHeader->Length - 0x%06x\n", HiiPackageHeader->Length));\r
 \r
   switch (HiiPackageHeader->Type) {\r
     case EFI_HII_PACKAGE_FORMS:\r
@@ -134,26 +134,26 @@ DumpHiiPackage (
         switch (IfrOpCodeHeader->OpCode) {\r
           case EFI_IFR_VARSTORE_OP:\r
             IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpCodeHeader;\r
-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
-            DEBUG ((EFI_D_INFO, "      Guid       - %g\n", &IfrVarStore->Guid));\r
-            DEBUG ((EFI_D_INFO, "      VarStoreId - 0x%04x\n", IfrVarStore->VarStoreId));\r
-            DEBUG ((EFI_D_INFO, "      Size       - 0x%04x\n", IfrVarStore->Size));\r
-            DEBUG ((EFI_D_INFO, "      Name       - %a\n", IfrVarStore->Name));\r
+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+            DEBUG ((DEBUG_INFO, "      Guid       - %g\n", &IfrVarStore->Guid));\r
+            DEBUG ((DEBUG_INFO, "      VarStoreId - 0x%04x\n", IfrVarStore->VarStoreId));\r
+            DEBUG ((DEBUG_INFO, "      Size       - 0x%04x\n", IfrVarStore->Size));\r
+            DEBUG ((DEBUG_INFO, "      Name       - %a\n", IfrVarStore->Name));\r
             break;\r
 \r
           case EFI_IFR_VARSTORE_EFI_OP:\r
             IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpCodeHeader;\r
             if (IfrEfiVarStore->Header.Length >= sizeof (EFI_IFR_VARSTORE_EFI)) {\r
-              DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
-              DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
-              DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
-              DEBUG ((EFI_D_INFO, "      Guid       - %g\n", &IfrEfiVarStore->Guid));\r
-              DEBUG ((EFI_D_INFO, "      VarStoreId - 0x%04x\n", IfrEfiVarStore->VarStoreId));\r
-              DEBUG ((EFI_D_INFO, "      Size       - 0x%04x\n", IfrEfiVarStore->Size));\r
-              DEBUG ((EFI_D_INFO, "      Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));\r
-              DEBUG ((EFI_D_INFO, "      Name       - %a\n", IfrEfiVarStore->Name));\r
+              DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+              DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
+              DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+              DEBUG ((DEBUG_INFO, "      Guid       - %g\n", &IfrEfiVarStore->Guid));\r
+              DEBUG ((DEBUG_INFO, "      VarStoreId - 0x%04x\n", IfrEfiVarStore->VarStoreId));\r
+              DEBUG ((DEBUG_INFO, "      Size       - 0x%04x\n", IfrEfiVarStore->Size));\r
+              DEBUG ((DEBUG_INFO, "      Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));\r
+              DEBUG ((DEBUG_INFO, "      Name       - %a\n", IfrEfiVarStore->Name));\r
             }\r
             break;\r
 \r
@@ -161,14 +161,14 @@ DumpHiiPackage (
           case EFI_IFR_CHECKBOX_OP:\r
           case EFI_IFR_NUMERIC_OP:\r
           case EFI_IFR_ORDERED_LIST_OP:\r
-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
-            DEBUG ((EFI_D_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
-            DEBUG ((EFI_D_INFO, "      Prompt       - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt));\r
-            DEBUG ((EFI_D_INFO, "      Help         - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help));\r
-            DEBUG ((EFI_D_INFO, "      QuestionId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.QuestionId));\r
-            DEBUG ((EFI_D_INFO, "      VarStoreId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId));\r
-            DEBUG ((EFI_D_INFO, "      VarStoreInfo - 0x%04x\n", ((EFI_IFR_ONE_OF * )IfrOpCodeHeader)->Question.VarStoreInfo.VarOffset));\r
+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
+            DEBUG ((DEBUG_INFO, "    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+            DEBUG ((DEBUG_INFO, "      Prompt       - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt));\r
+            DEBUG ((DEBUG_INFO, "      Help         - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help));\r
+            DEBUG ((DEBUG_INFO, "      QuestionId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.QuestionId));\r
+            DEBUG ((DEBUG_INFO, "      VarStoreId   - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId));\r
+            DEBUG ((DEBUG_INFO, "      VarStoreInfo - 0x%04x\n", ((EFI_IFR_ONE_OF * )IfrOpCodeHeader)->Question.VarStoreInfo.VarOffset));\r
             {\r
               EFI_IFR_ONE_OF            *IfrOneOf;\r
               EFI_IFR_CHECKBOX          *IfrCheckBox;\r
@@ -178,64 +178,64 @@ DumpHiiPackage (
               switch (IfrOpCodeHeader->OpCode) {\r
                 case EFI_IFR_ONE_OF_OP:\r
                   IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpCodeHeader;\r
-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrOneOf->Flags));\r
+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrOneOf->Flags));\r
                   switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {\r
                   case EFI_IFR_NUMERIC_SIZE_1:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%02x\n", IfrOneOf->data.u8.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%02x\n", IfrOneOf->data.u8.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%02x\n", IfrOneOf->data.u8.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%02x\n", IfrOneOf->data.u8.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%02x\n", IfrOneOf->data.u8.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%02x\n", IfrOneOf->data.u8.Step));\r
                     break;\r
                   case EFI_IFR_NUMERIC_SIZE_2:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%04x\n", IfrOneOf->data.u16.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%04x\n", IfrOneOf->data.u16.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%04x\n", IfrOneOf->data.u16.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%04x\n", IfrOneOf->data.u16.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%04x\n", IfrOneOf->data.u16.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%04x\n", IfrOneOf->data.u16.Step));\r
                     break;\r
                   case EFI_IFR_NUMERIC_SIZE_4:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%08x\n", IfrOneOf->data.u32.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%08x\n", IfrOneOf->data.u32.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%08x\n", IfrOneOf->data.u32.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%08x\n", IfrOneOf->data.u32.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%08x\n", IfrOneOf->data.u32.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%08x\n", IfrOneOf->data.u32.Step));\r
                     break;\r
                   case EFI_IFR_NUMERIC_SIZE_8:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%016lx\n", IfrOneOf->data.u64.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%016lx\n", IfrOneOf->data.u64.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%016lx\n", IfrOneOf->data.u64.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%016lx\n", IfrOneOf->data.u64.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%016lx\n", IfrOneOf->data.u64.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%016lx\n", IfrOneOf->data.u64.Step));\r
                     break;\r
                   }\r
                   break;\r
                 case EFI_IFR_CHECKBOX_OP:\r
                   IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpCodeHeader;\r
-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrCheckBox->Flags));\r
+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrCheckBox->Flags));\r
                   break;\r
                 case EFI_IFR_NUMERIC_OP:\r
                   IfrNumeric = (EFI_IFR_NUMERIC *) IfrOpCodeHeader;\r
-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrNumeric->Flags));\r
+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrNumeric->Flags));\r
                   switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {\r
                   case EFI_IFR_NUMERIC_SIZE_1:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%02x\n", IfrNumeric->data.u8.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%02x\n", IfrNumeric->data.u8.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%02x\n", IfrNumeric->data.u8.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%02x\n", IfrNumeric->data.u8.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%02x\n", IfrNumeric->data.u8.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%02x\n", IfrNumeric->data.u8.Step));\r
                     break;\r
                   case EFI_IFR_NUMERIC_SIZE_2:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%04x\n", IfrNumeric->data.u16.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%04x\n", IfrNumeric->data.u16.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%04x\n", IfrNumeric->data.u16.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%04x\n", IfrNumeric->data.u16.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%04x\n", IfrNumeric->data.u16.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%04x\n", IfrNumeric->data.u16.Step));\r
                     break;\r
                   case EFI_IFR_NUMERIC_SIZE_4:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%08x\n", IfrNumeric->data.u32.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%08x\n", IfrNumeric->data.u32.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%08x\n", IfrNumeric->data.u32.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%08x\n", IfrNumeric->data.u32.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%08x\n", IfrNumeric->data.u32.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%08x\n", IfrNumeric->data.u32.Step));\r
                     break;\r
                   case EFI_IFR_NUMERIC_SIZE_8:\r
-                    DEBUG ((EFI_D_INFO, "      MinValue      - 0x%016lx\n", IfrNumeric->data.u64.MinValue));\r
-                    DEBUG ((EFI_D_INFO, "      MaxValue      - 0x%016lx\n", IfrNumeric->data.u64.MaxValue));\r
-                    DEBUG ((EFI_D_INFO, "      Step          - 0x%016lx\n", IfrNumeric->data.u64.Step));\r
+                    DEBUG ((DEBUG_INFO, "      MinValue      - 0x%016lx\n", IfrNumeric->data.u64.MinValue));\r
+                    DEBUG ((DEBUG_INFO, "      MaxValue      - 0x%016lx\n", IfrNumeric->data.u64.MaxValue));\r
+                    DEBUG ((DEBUG_INFO, "      Step          - 0x%016lx\n", IfrNumeric->data.u64.Step));\r
                     break;\r
                   }\r
                   break;\r
                 case EFI_IFR_ORDERED_LIST_OP:\r
                   IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpCodeHeader;\r
-                  DEBUG ((EFI_D_INFO, "      MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));\r
-                  DEBUG ((EFI_D_INFO, "      Flags         - 0x%02x\n", IfrOrderedList->Flags));\r
+                  DEBUG ((DEBUG_INFO, "      MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));\r
+                  DEBUG ((DEBUG_INFO, "      Flags         - 0x%02x\n", IfrOrderedList->Flags));\r
                   break;\r
                 default:\r
                   break;\r
@@ -251,26 +251,26 @@ DumpHiiPackage (
                   switch (IfrOpCodeHeader->OpCode) {\r
                     case EFI_IFR_ONE_OF_OPTION_OP:\r
                       IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *)IfrOpCodeHeader;\r
-                      DEBUG ((EFI_D_INFO, "!!!!    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
-                      DEBUG ((EFI_D_INFO, "!!!!    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
-                      DEBUG ((EFI_D_INFO, "!!!!      Option                - 0x%04x\n", IfrOneOfOption->Option));\r
-                      DEBUG ((EFI_D_INFO, "!!!!      Flags                 - 0x%02x\n", IfrOneOfOption->Flags));\r
-                      DEBUG ((EFI_D_INFO, "!!!!      Type                  - 0x%02x\n", IfrOneOfOption->Type));\r
+                      DEBUG ((DEBUG_INFO, "!!!!    IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+                      DEBUG ((DEBUG_INFO, "!!!!    IfrOpCodeHeader->Scope  - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+                      DEBUG ((DEBUG_INFO, "!!!!      Option                - 0x%04x\n", IfrOneOfOption->Option));\r
+                      DEBUG ((DEBUG_INFO, "!!!!      Flags                 - 0x%02x\n", IfrOneOfOption->Flags));\r
+                      DEBUG ((DEBUG_INFO, "!!!!      Type                  - 0x%02x\n", IfrOneOfOption->Type));\r
                       switch (IfrOneOfOption->Type) {\r
                         case EFI_IFR_TYPE_NUM_SIZE_8:\r
-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.u8));\r
+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.u8));\r
                           break;\r
                         case EFI_IFR_TYPE_NUM_SIZE_16:\r
-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%04x\n", IfrOneOfOption->Value.u16));\r
+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%04x\n", IfrOneOfOption->Value.u16));\r
                           break;\r
                         case EFI_IFR_TYPE_NUM_SIZE_32:\r
-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%08x\n", IfrOneOfOption->Value.u32));\r
+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%08x\n", IfrOneOfOption->Value.u32));\r
                           break;\r
                         case EFI_IFR_TYPE_NUM_SIZE_64:\r
-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%016lx\n", IfrOneOfOption->Value.u64));\r
+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%016lx\n", IfrOneOfOption->Value.u64));\r
                           break;\r
                         case EFI_IFR_TYPE_BOOLEAN:\r
-                          DEBUG ((EFI_D_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.b));\r
+                          DEBUG ((DEBUG_INFO, "!!!!      Value                 - 0x%02x\n", IfrOneOfOption->Value.b));\r
                           break;\r
                         default:\r
                           break;\r
@@ -318,12 +318,12 @@ DumpHiiDatabase (
   EFI_HII_PACKAGE_LIST_HEADER   *HiiPackageListHeader;\r
   EFI_HII_PACKAGE_HEADER        *HiiPackageHeader;\r
 \r
-  DEBUG ((EFI_D_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));\r
+  DEBUG ((DEBUG_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));\r
   HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) HiiDatabase;\r
 \r
   while ((UINTN) HiiPackageListHeader < ((UINTN) HiiDatabase + HiiDatabaseSize)) {\r
-    DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &HiiPackageListHeader->PackageListGuid));\r
-    DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageLength   - 0x%x\n", (UINTN)HiiPackageListHeader->PackageLength));\r
+    DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &HiiPackageListHeader->PackageListGuid));\r
+    DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageLength   - 0x%x\n", (UINTN)HiiPackageListHeader->PackageLength));\r
     HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)(HiiPackageListHeader + 1);\r
 \r
     while ((UINTN) HiiPackageHeader < (UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength) {\r
@@ -505,7 +505,7 @@ MergeHiiQuestion (
 \r
   switch (HiiQuestion1->OpCode) {\r
     case EFI_IFR_ONE_OF_OP:\r
-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
       //\r
       // Get the length of Hii Question 1.\r
       //\r
@@ -586,11 +586,11 @@ MergeHiiQuestion (
       break;\r
 \r
     case EFI_IFR_CHECKBOX_OP:\r
-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
       break;\r
 \r
     case EFI_IFR_NUMERIC_OP:\r
-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
       //\r
       // Get minimum and maximum of Hii Question 1.\r
       //\r
@@ -630,7 +630,7 @@ MergeHiiQuestion (
       break;\r
 \r
     case EFI_IFR_ORDERED_LIST_OP:\r
-      DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+      DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
       //\r
       // Get the length of Hii Question 1.\r
       //\r
@@ -1403,7 +1403,7 @@ BuildVarCheckHiiBin (
     BinSize += HiiVariableLength;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));\r
+  DEBUG ((DEBUG_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));\r
   if (BinSize == 0) {\r
     *Size = BinSize;\r
     return NULL;\r
@@ -1416,7 +1416,7 @@ BuildVarCheckHiiBin (
   //\r
   Data = AllocateRuntimeZeroPool (BinSize);\r
   ASSERT (Data != NULL);\r
-  DEBUG ((EFI_D_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));\r
+  DEBUG ((DEBUG_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));\r
 \r
   //\r
   // Gen Data\r
@@ -1465,7 +1465,7 @@ VarCheckHiiGen (
 \r
   mVarCheckHiiBin = BuildVarCheckHiiBin (&mVarCheckHiiBinSize);\r
   if (mVarCheckHiiBin == NULL) {\r
-    DEBUG ((EFI_D_INFO, "[VarCheckHii] This driver could be removed from *.dsc and *.fdf\n"));\r
+    DEBUG ((DEBUG_INFO, "[VarCheckHii] This driver could be removed from *.dsc and *.fdf\n"));\r
     return;\r
   }\r
 \r

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
index 71ece272e1bbef9d453a84343c06c4e5a3438370..78663503be14c78dfe1405a43577cfb7ceee24c3 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
@@ -219,8 +219,8 @@ ParseFfs (
                         &AuthenticationStatus\r
                         );\r
         if (!EFI_ERROR (Status)) {\r
-          DEBUG ((EFI_D_INFO, "FfsNameGuid - %g\n", DriverGuid));\r
-          DEBUG ((EFI_D_INFO, "NumberofMatchingVfrBin - 0x%02x\n", NumberofMatchingVfrBin));\r
+          DEBUG ((DEBUG_INFO , "FfsNameGuid - %g\n", DriverGuid));\r
+          DEBUG ((DEBUG_INFO , "NumberofMatchingVfrBin - 0x%02x\n", NumberofMatchingVfrBin));\r
 \r
           for (VfrBinIndex = 0; VfrBinIndex < NumberofMatchingVfrBin; VfrBinIndex++) {\r
 #ifdef DUMP_HII_DATA\r
@@ -284,7 +284,7 @@ ParseFv (
   // Search all FVs\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    DEBUG ((EFI_D_INFO, "FvIndex - %x\n", Index));\r
+    DEBUG ((DEBUG_INFO , "FvIndex - %x\n", Index));\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiFirmwareVolume2ProtocolGuid,\r
@@ -305,9 +305,9 @@ ParseFv (
       ASSERT_EFI_ERROR (Status);\r
       Status = Fvb2->GetPhysicalAddress (Fvb2, &FvAddress);\r
       if (!EFI_ERROR (Status)) {\r
-        DEBUG ((EFI_D_INFO, "FvAddress - 0x%08x\n", FvAddress));\r
+        DEBUG ((DEBUG_INFO , "FvAddress - 0x%08x\n", FvAddress));\r
         FvSize = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvLength;\r
-        DEBUG ((EFI_D_INFO, "FvSize    - 0x%08x\n", FvSize));\r
+        DEBUG ((DEBUG_INFO , "FvSize    - 0x%08x\n", FvSize));\r
       }\r
     );\r
 \r
@@ -373,7 +373,7 @@ CreateVfrDriverList (
   VAR_CHECK_VFR_DRIVER_INFO     *VfrDriverInfo;\r
 \r
   for (Index = 0; !IsZeroGuid (&DriverGuidArray[Index]); Index++) {\r
-     DEBUG ((EFI_D_INFO, "CreateVfrDriverList: %g\n", &DriverGuidArray[Index]));\r
+     DEBUG ((DEBUG_INFO , "CreateVfrDriverList: %g\n", &DriverGuidArray[Index]));\r
      VfrDriverInfo = InternalVarCheckAllocateZeroPool (sizeof (*VfrDriverInfo));\r
      ASSERT (VfrDriverInfo != NULL);\r
      VfrDriverInfo->Signature = VAR_CHECK_VFR_DRIVER_INFO_SIGNATURE;\r
@@ -414,7 +414,7 @@ VarCheckHiiGenFromFv (
   EFI_GUID      *DriverGuidArray;\r
   BOOLEAN       ScanAll;\r
 \r
-  DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromFv\n"));\r
+  DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromFv\n"));\r
 \r
   //\r
   // Get vfr driver guid array from PCD.\r

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
index 41cde34af742aa0254b04a4f4da2e26cc699691f..de2de48634495477806bce2610475e8a394368fa 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
@@ -58,7 +58,7 @@ VarCheckHiiGenFromHiiDatabase (
     Status = HiiDatabase->ExportPackageLists (HiiDatabase, 0, &BufferSize, Buffer);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromHii - HII Database exported at 0x%x, size = 0x%x\n", Buffer, BufferSize));\r
+    DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromHii - HII Database exported at 0x%x, size = 0x%x\n", Buffer, BufferSize));\r
 \r
 #ifdef DUMP_HII_DATA\r
     DEBUG_CODE (\r

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
index 93ff9340e90c86f68284826f66ece4909cf96bf0..46a93bdb8a1b65e6112b5f25e4294a33cda74028 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
@@ -60,7 +60,7 @@ VarCheckHiiInternalDumpHex (
 \r
     Val[Index * 3]  = 0;\r
     Str[Index]      = 0;\r
-    DEBUG ((EFI_D_INFO, "%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str));\r
+    DEBUG ((DEBUG_INFO , "%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str));\r
 \r
     Data += Size;\r
     Offset += Size;\r
@@ -95,7 +95,7 @@ VarCheckHiiQuestion (
   UINT8    MaxContainers;\r
 \r
   if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth) > DataSize) {\r
-    DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, DataSize));\r
+    DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, DataSize));\r
     return FALSE;\r
   }\r
 \r
@@ -120,7 +120,7 @@ VarCheckHiiQuestion (
         //\r
         // No match\r
         //\r
-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: OneOf mismatch (0x%lx)\n", OneData));\r
+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OneOf mismatch (0x%lx)\n", OneData));\r
         DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
         return FALSE;\r
       }\r
@@ -128,7 +128,7 @@ VarCheckHiiQuestion (
 \r
     case EFI_IFR_CHECKBOX_OP:\r
       if ((OneData != 0) && (OneData != 1)) {\r
-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: CheckBox mismatch (0x%lx)\n", OneData));\r
+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: CheckBox mismatch (0x%lx)\n", OneData));\r
         DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
         return FALSE;\r
       }\r
@@ -147,7 +147,7 @@ VarCheckHiiQuestion (
       // No need to check Step, because it is ONLY for UI.\r
       //\r
       if ((OneData < Minimum) || (OneData > Maximum)) {\r
-        DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: Numeric mismatch (0x%lx)\n", OneData));\r
+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: Numeric mismatch (0x%lx)\n", OneData));\r
         DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
         return FALSE;\r
       }\r
@@ -156,7 +156,7 @@ VarCheckHiiQuestion (
     case EFI_IFR_ORDERED_LIST_OP:\r
       MaxContainers = ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers;\r
       if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth * MaxContainers) > DataSize) {\r
-        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));\r
+        DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize));\r
         return FALSE;\r
       }\r
       for (Index = 0; Index < MaxContainers; Index++) {\r
@@ -185,7 +185,7 @@ VarCheckHiiQuestion (
           //\r
           // No match\r
           //\r
-          DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: OrderedList mismatch\n"));\r
+          DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OrderedList mismatch\n"));\r
           DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->StorageWidth * MaxContainers, (UINT8 *) Data + HiiQuestion->VarOffset););\r
           DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
           return FALSE;\r
@@ -251,19 +251,19 @@ SetVariableCheckHandlerHii (
       //\r
       // Found the Hii Variable that could be used to do check.\r
       //\r
-      DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - %s:%g with Attributes = 0x%08x Size = 0x%x\n", VariableName, VendorGuid, Attributes, DataSize));\r
+      DEBUG ((DEBUG_INFO , "VarCheckHiiVariable - %s:%g with Attributes = 0x%08x Size = 0x%x\n", VariableName, VendorGuid, Attributes, DataSize));\r
       if (HiiVariable->Attributes != Attributes) {\r
-        DEBUG ((EFI_D_INFO, "VarCheckHiiVariable fail for Attributes - 0x%08x\n", HiiVariable->Attributes));\r
+        DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Attributes - 0x%08x\n", HiiVariable->Attributes));\r
         return EFI_SECURITY_VIOLATION;\r
       }\r
 \r
       if (DataSize == 0) {\r
-        DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - CHECK PASS with DataSize == 0 !\n"));\r
+        DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - CHECK PASS with DataSize == 0 !\n"));\r
         return EFI_SUCCESS;\r
       }\r
 \r
       if (HiiVariable->Size != DataSize) {\r
-        DEBUG ((EFI_D_INFO, "VarCheckHiiVariable fail for Size - 0x%x\n", HiiVariable->Size));\r
+        DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Size - 0x%x\n", HiiVariable->Size));\r
         return EFI_SECURITY_VIOLATION;\r
       }\r
 \r
@@ -282,7 +282,7 @@ SetVariableCheckHandlerHii (
         HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiQuestion + HiiQuestion->Length));\r
       }\r
 \r
-      DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - ALL CHECK PASS!\n"));\r
+      DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - ALL CHECK PASS!\n"));\r
       return EFI_SUCCESS;\r
     }\r
     //\r
@@ -343,11 +343,11 @@ DumpHiiQuestion (
   UINT64    OneValue;\r
   UINT8     *Ptr;\r
 \r
-  DEBUG ((EFI_D_INFO, "  VAR_CHECK_HII_QUESTION_HEADER\n"));\r
-  DEBUG ((EFI_D_INFO, "    OpCode        - 0x%02x (%a)\n", HiiQuestion->OpCode, HiiOpCodeToStr (HiiQuestion->OpCode)));\r
-  DEBUG ((EFI_D_INFO, "    Length        - 0x%02x\n", HiiQuestion->Length));\r
-  DEBUG ((EFI_D_INFO, "    VarOffset     - 0x%04x\n", HiiQuestion->VarOffset));\r
-  DEBUG ((EFI_D_INFO, "    StorageWidth  - 0x%02x\n", HiiQuestion->StorageWidth));\r
+  DEBUG ((DEBUG_INFO, "  VAR_CHECK_HII_QUESTION_HEADER\n"));\r
+  DEBUG ((DEBUG_INFO, "    OpCode        - 0x%02x (%a)\n", HiiQuestion->OpCode, HiiOpCodeToStr (HiiQuestion->OpCode)));\r
+  DEBUG ((DEBUG_INFO, "    Length        - 0x%02x\n", HiiQuestion->Length));\r
+  DEBUG ((DEBUG_INFO, "    VarOffset     - 0x%04x\n", HiiQuestion->VarOffset));\r
+  DEBUG ((DEBUG_INFO, "    StorageWidth  - 0x%02x\n", HiiQuestion->StorageWidth));\r
 \r
   switch (HiiQuestion->OpCode) {\r
     case EFI_IFR_ONE_OF_OP:\r
@@ -357,16 +357,16 @@ DumpHiiQuestion (
         CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);\r
         switch (HiiQuestion->StorageWidth) {\r
           case sizeof (UINT8):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%02x\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%02x\n", OneValue));\r
             break;\r
           case sizeof (UINT16):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%04x\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%04x\n", OneValue));\r
             break;\r
           case sizeof (UINT32):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%08x\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%08x\n", OneValue));\r
             break;\r
           case sizeof (UINT64):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));\r
             break;\r
           default:\r
             ASSERT (FALSE);\r
@@ -390,20 +390,20 @@ DumpHiiQuestion (
 \r
       switch (HiiQuestion->StorageWidth) {\r
         case sizeof (UINT8):\r
-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%02x\n", Minimum));\r
-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%02x\n", Maximum));\r
+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%02x\n", Minimum));\r
+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%02x\n", Maximum));\r
           break;\r
         case sizeof (UINT16):\r
-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%04x\n", Minimum));\r
-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%04x\n", Maximum));\r
+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%04x\n", Minimum));\r
+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%04x\n", Maximum));\r
           break;\r
         case sizeof (UINT32):\r
-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%08x\n", Minimum));\r
-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%08x\n", Maximum));\r
+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%08x\n", Minimum));\r
+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%08x\n", Maximum));\r
           break;\r
         case sizeof (UINT64):\r
-          DEBUG ((EFI_D_INFO, "    Minimum       - 0x%016lx\n", Minimum));\r
-          DEBUG ((EFI_D_INFO, "    Maximum       - 0x%016lx\n", Maximum));\r
+          DEBUG ((DEBUG_INFO, "    Minimum       - 0x%016lx\n", Minimum));\r
+          DEBUG ((DEBUG_INFO, "    Maximum       - 0x%016lx\n", Maximum));\r
           break;\r
         default:\r
           ASSERT (FALSE);\r
@@ -412,23 +412,23 @@ DumpHiiQuestion (
       break;\r
 \r
     case EFI_IFR_ORDERED_LIST_OP:\r
-      DEBUG ((EFI_D_INFO, "    MaxContainers - 0x%02x\n", ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers));\r
+      DEBUG ((DEBUG_INFO, "    MaxContainers - 0x%02x\n", ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers));\r
       Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion + 1);\r
       while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) {\r
         OneValue = 0;\r
         CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);\r
         switch (HiiQuestion->StorageWidth) {\r
           case sizeof (UINT8):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%02x\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%02x\n", OneValue));\r
             break;\r
           case sizeof (UINT16):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%04x\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%04x\n", OneValue));\r
             break;\r
           case sizeof (UINT32):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%08x\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%08x\n", OneValue));\r
             break;\r
           case sizeof (UINT64):\r
-            DEBUG ((EFI_D_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));\r
+            DEBUG ((DEBUG_INFO, "    OneOfOption   - 0x%016lx\n", OneValue));\r
             break;\r
           default:\r
             ASSERT (FALSE);\r
@@ -457,15 +457,15 @@ DumpHiiVariable (
 {\r
   VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
 \r
-  DEBUG ((EFI_D_INFO, "VAR_CHECK_HII_VARIABLE_HEADER\n"));\r
-  DEBUG ((EFI_D_INFO, "  Revision        - 0x%04x\n", HiiVariable->Revision));\r
-  DEBUG ((EFI_D_INFO, "  HeaderLength    - 0x%04x\n", HiiVariable->HeaderLength));\r
-  DEBUG ((EFI_D_INFO, "  Length          - 0x%08x\n", HiiVariable->Length));\r
-  DEBUG ((EFI_D_INFO, "  OpCode          - 0x%02x (%a)\n", HiiVariable->OpCode, HiiOpCodeToStr (HiiVariable->OpCode)));\r
-  DEBUG ((EFI_D_INFO, "  Size            - 0x%04x\n", HiiVariable->Size));\r
-  DEBUG ((EFI_D_INFO, "  Attributes      - 0x%08x\n", HiiVariable->Attributes));\r
-  DEBUG ((EFI_D_INFO, "  Guid            - %g\n", &HiiVariable->Guid));\r
-  DEBUG ((EFI_D_INFO, "  Name            - %s\n", HiiVariable + 1));\r
+  DEBUG ((DEBUG_INFO, "VAR_CHECK_HII_VARIABLE_HEADER\n"));\r
+  DEBUG ((DEBUG_INFO, "  Revision        - 0x%04x\n", HiiVariable->Revision));\r
+  DEBUG ((DEBUG_INFO, "  HeaderLength    - 0x%04x\n", HiiVariable->HeaderLength));\r
+  DEBUG ((DEBUG_INFO, "  Length          - 0x%08x\n", HiiVariable->Length));\r
+  DEBUG ((DEBUG_INFO, "  OpCode          - 0x%02x (%a)\n", HiiVariable->OpCode, HiiOpCodeToStr (HiiVariable->OpCode)));\r
+  DEBUG ((DEBUG_INFO, "  Size            - 0x%04x\n", HiiVariable->Size));\r
+  DEBUG ((DEBUG_INFO, "  Attributes      - 0x%08x\n", HiiVariable->Attributes));\r
+  DEBUG ((DEBUG_INFO, "  Guid            - %g\n", &HiiVariable->Guid));\r
+  DEBUG ((DEBUG_INFO, "  Name            - %s\n", HiiVariable + 1));\r
 \r
   //\r
   // For Hii Question header align.\r
@@ -498,7 +498,7 @@ DumpVarCheckHii (
 {\r
   VAR_CHECK_HII_VARIABLE_HEADER     *HiiVariable;\r
 \r
-  DEBUG ((EFI_D_INFO, "DumpVarCheckHii\n"));\r
+  DEBUG ((DEBUG_INFO, "DumpVarCheckHii\n"));\r
 \r
   //\r
   // For Hii Variable header align.\r