From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=dandan.bi@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 896E52034EE25 for ; Sun, 5 Nov 2017 02:02:26 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Nov 2017 02:06:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,346,1505804400"; d="scan'208";a="169496247" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by orsmga005.jf.intel.com with ESMTP; 05 Nov 2017 02:06:21 -0800 From: Dandan Bi To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong , Liming Gao Date: Sun, 5 Nov 2017 18:06:00 +0800 Message-Id: <1509876361-35956-2-git-send-email-dandan.bi@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1509876361-35956-1-git-send-email-dandan.bi@intel.com> References: <1509876361-35956-1-git-send-email-dandan.bi@intel.com> Subject: [PATCH v2 1/2] MdeModulePkg/VarCheckHiiLib: Replace EFI_D_INFO with DEBUG_INFO X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2017 10:02:26 -0000 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 Cc: Eric Dong Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../Library/VarCheckHiiLib/VarCheckHiiGen.c | 148 ++++++++++----------- .../Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c | 14 +- .../Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c | 2 +- .../VarCheckHiiLib/VarCheckHiiLibNullClass.c | 88 ++++++------ 4 files changed, 126 insertions(+), 126 deletions(-) diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c index f018c87..a334a6f 100644 --- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c +++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c @@ -121,123 +121,123 @@ DumpHiiPackage ( EFI_IFR_VARSTORE *IfrVarStore; EFI_IFR_VARSTORE_EFI *IfrEfiVarStore; 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: IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) (HiiPackageHeader + 1); while ((UINTN) IfrOpCodeHeader < ((UINTN) HiiPackageHeader + HiiPackageHeader->Length)) { 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 - 0x02%x\n", IfrOpCodeHeader->Length)); - DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Scope - 0x02%x\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 - 0x02%x\n", IfrOpCodeHeader->Length)); + DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Scope - 0x02%x\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; case EFI_IFR_ONE_OF_OP: 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 - 0x02%x\n", IfrOpCodeHeader->Length)); - DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Scope - 0x02%x\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 - 0x02%x\n", IfrOpCodeHeader->Length)); + DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Scope - 0x02%x\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; EFI_IFR_NUMERIC *IfrNumeric; EFI_IFR_ORDERED_LIST *IfrOrderedList; 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; } @@ -249,30 +249,30 @@ DumpHiiPackage ( Scope = 1; while (Scope != 0) { 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; } break; @@ -316,16 +316,16 @@ 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) { DumpHiiPackage (HiiPackageHeader); @@ -503,11 +503,11 @@ MergeHiiQuestion ( ASSERT ((HiiQuestion1->OpCode == HiiQuestion2->OpCode) && (HiiQuestion1->StorageWidth == HiiQuestion2->StorageWidth)); 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. // NewLength = HiiQuestion1->Length; @@ -584,15 +584,15 @@ MergeHiiQuestion ( InternalVarCheckFreePool (HiiQuestion1); } 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. // Minimum1 = 0; Maximum1 = 0; @@ -628,11 +628,11 @@ MergeHiiQuestion ( CopyMem (Ptr, &Maximum1, HiiQuestion1->StorageWidth); } 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. // NewLength = HiiQuestion1->Length; @@ -1401,11 +1401,11 @@ BuildVarCheckHiiBin ( HiiVariableNode->HiiVariable->Length = HiiVariableLength; 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; } @@ -1414,11 +1414,11 @@ BuildVarCheckHiiBin ( // Only here AllocateRuntimeZeroPool () from MemoryAllocateLib is used for runtime access // in SetVariable check handler. // 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 // Ptr = Data; @@ -1463,11 +1463,11 @@ VarCheckHiiGen ( VarCheckHiiGenFromHiiDatabase (); VarCheckHiiGenFromFv (); 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; } DestroyHiiVariableNode (); if (mVarName != NULL) { diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c index 71ece27..7866350 100644 --- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c +++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c @@ -217,12 +217,12 @@ ParseFfs ( &SectionBuffer, &SectionSize, &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 DEBUG_CODE ( DumpHiiPackage ((UINT8 *) (UINTN) SectionBuffer + VfrBinBaseAddress[VfrBinIndex] + sizeof (UINT32)); @@ -282,11 +282,11 @@ 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, (VOID **) &Fv2 ); @@ -303,13 +303,13 @@ ParseFv ( (VOID **) &Fvb2 ); 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)); } ); if (ScanAll) { // @@ -371,11 +371,11 @@ CreateVfrDriverList ( { UINTN Index; 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; VfrDriverInfo->DriverGuid = &DriverGuidArray[Index]; InsertTailList (&mVfrDriverList, &VfrDriverInfo->Link); @@ -412,11 +412,11 @@ VarCheckHiiGenFromFv ( ) { EFI_GUID *DriverGuidArray; BOOLEAN ScanAll; - DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromFv\n")); + DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromFv\n")); // // Get vfr driver guid array from PCD. // DriverGuidArray = (EFI_GUID *) PcdGetPtr (PcdVarCheckVfrDriverGuidArray); diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c index 41cde34..de2de48 100644 --- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c +++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c @@ -56,11 +56,11 @@ VarCheckHiiGenFromHiiDatabase ( // Export HII Database into the buffer. // 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 ( DumpHiiDatabase (Buffer, BufferSize); ); diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c index 93ff934..46a93bd 100644 --- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c +++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c @@ -58,11 +58,11 @@ VarCheckHiiInternalDumpHex ( Str[Index] = (CHAR8) ((TempByte < ' ' || TempByte > 'z') ? '.' : TempByte); } 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; DataSize -= Size; } @@ -93,11 +93,11 @@ VarCheckHiiQuestion ( UINT8 *Ptr; UINT8 Index; 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; } OneData = 0; CopyMem (&OneData, (UINT8 *) Data + HiiQuestion->VarOffset, HiiQuestion->StorageWidth); @@ -118,19 +118,19 @@ VarCheckHiiQuestion ( } if ((UINTN) Ptr >= ((UINTN) HiiQuestion + HiiQuestion->Length)) { // // 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; } break; 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; } break; @@ -145,20 +145,20 @@ 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; } break; 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++) { OneData = 0; CopyMem (&OneData, (UINT8 *) Data + HiiQuestion->VarOffset + HiiQuestion->StorageWidth * Index, HiiQuestion->StorageWidth); @@ -183,11 +183,11 @@ VarCheckHiiQuestion ( } if ((UINTN) Ptr >= ((UINTN) HiiQuestion + HiiQuestion->Length)) { // // 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; } } @@ -249,23 +249,23 @@ SetVariableCheckHandlerHii ( if ((StrCmp ((CHAR16 *) (HiiVariable + 1), VariableName) == 0) && (CompareGuid (&HiiVariable->Guid, VendorGuid))) { // // 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; } // // Do the check. @@ -280,11 +280,11 @@ SetVariableCheckHandlerHii ( // For Hii Question header align. // 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; } // // For Hii Variable header align. // @@ -341,34 +341,34 @@ DumpHiiQuestion ( UINT64 Minimum; UINT64 Maximum; 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: Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) 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); break; } @@ -388,49 +388,49 @@ DumpHiiQuestion ( CopyMem (&Maximum, Ptr, HiiQuestion->StorageWidth); Ptr += HiiQuestion->StorageWidth; 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); break; } 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); break; } @@ -455,19 +455,19 @@ DumpHiiVariable ( IN VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable ) { 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. // HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiVariable + HiiVariable->HeaderLength)); @@ -496,11 +496,11 @@ DumpVarCheckHii ( IN UINTN VarCheckHiiBinSize ) { VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable; - DEBUG ((EFI_D_INFO, "DumpVarCheckHii\n")); + DEBUG ((DEBUG_INFO, "DumpVarCheckHii\n")); // // For Hii Variable header align. // HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *) HEADER_ALIGN (VarCheckHiiBin); -- 1.9.5.msysgit.1