From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 DB8282034AB39 for ; Sun, 5 Nov 2017 21:42:07 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Nov 2017 21:46:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,351,1505804400"; d="scan'208";a="332504305" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga004.fm.intel.com with ESMTP; 05 Nov 2017 21:46:05 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 5 Nov 2017 21:46:05 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 5 Nov 2017 21:46:04 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Mon, 6 Nov 2017 13:46:02 +0800 From: "Zeng, Star" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Dong, Eric" , "Zeng, Star" Thread-Topic: [edk2] [PATCH v2 1/2] MdeModulePkg/VarCheckHiiLib: Replace EFI_D_INFO with DEBUG_INFO Thread-Index: AQHTVh3Be2tsmOKpHkm+XbmD0JRFOKMG2MPg Date: Mon, 6 Nov 2017 05:46:02 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B1DC4@shsmsx102.ccr.corp.intel.com> References: <1509876361-35956-1-git-send-email-dandan.bi@intel.com> <1509876361-35956-2-git-send-email-dandan.bi@intel.com> In-Reply-To: <1509876361-35956-2-git-send-email-dandan.bi@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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: Mon, 06 Nov 2017 05:42:08 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Dand= an Bi Sent: Sunday, November 5, 2017 6:06 PM To: edk2-devel@lists.01.org Cc: Gao, Liming ; Dong, Eric ; Z= eng, Star Subject: [edk2] [PATCH v2 1/2] MdeModulePkg/VarCheckHiiLib: Replace EFI_D_I= NFO 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 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/MdeModu= lePkg/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; =20 HiiPackageHeader =3D (EFI_HII_PACKAGE_HEADER *) HiiPackage; =20 - DEBUG ((EFI_D_INFO, " HiiPackageHeader->Type - 0x%02x (%a)\n", HiiPac= kageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type))); - DEBUG ((EFI_D_INFO, " HiiPackageHeader->Length - 0x%06x\n", HiiPackageH= eader->Length)); + DEBUG ((DEBUG_INFO, " HiiPackageHeader->Type - 0x%02x (%a)\n", HiiPac= kageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type))); + DEBUG ((DEBUG_INFO, " HiiPackageHeader->Length - 0x%06x\n",=20 + HiiPackageHeader->Length)); =20 switch (HiiPackageHeader->Type) { case EFI_HII_PACKAGE_FORMS: IfrOpCodeHeader =3D (EFI_IFR_OP_HEADER *) (HiiPackageHeader + 1); =20 while ((UINTN) IfrOpCodeHeader < ((UINTN) HiiPackageHeader + HiiPack= ageHeader->Length)) { switch (IfrOpCodeHeader->OpCode) { case EFI_IFR_VARSTORE_OP: IfrVarStore =3D (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->G= uid)); - 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->Na= me)); + 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->G= uid)); + 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->Na= me)); break; =20 case EFI_IFR_VARSTORE_EFI_OP: IfrEfiVarStore =3D (EFI_IFR_VARSTORE_EFI *) IfrOpCodeHeader; if (IfrEfiVarStore->Header.Length >=3D sizeof (EFI_IFR_VARSTOR= E_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", &IfrEfiVarSto= re->Guid)); - DEBUG ((EFI_D_INFO, " VarStoreId - 0x%04x\n", IfrEfiVar= Store->VarStoreId)); - DEBUG ((EFI_D_INFO, " Size - 0x%04x\n", IfrEfiVar= Store->Size)); - DEBUG ((EFI_D_INFO, " Attributes - 0x%08x\n", IfrEfiVar= Store->Attributes)); - DEBUG ((EFI_D_INFO, " Name - %a\n", IfrEfiVarStor= e->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", &IfrEfiVarSto= re->Guid)); + DEBUG ((DEBUG_INFO, " VarStoreId - 0x%04x\n", IfrEfiVar= Store->VarStoreId)); + DEBUG ((DEBUG_INFO, " Size - 0x%04x\n", IfrEfiVar= Store->Size)); + DEBUG ((DEBUG_INFO, " Attributes - 0x%08x\n", IfrEfiVar= Store->Attributes)); + DEBUG ((DEBUG_INFO, " Name - %a\n", IfrEfiVarStor= e->Name)); } break; =20 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; =20 switch (IfrOpCodeHeader->OpCode) { case EFI_IFR_ONE_OF_OP: IfrOneOf =3D (EFI_IFR_ONE_OF *) IfrOpCodeHeader; - DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", If= rOneOf->Flags)); + DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", If= rOneOf->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 =3D (EFI_IFR_CHECKBOX *) IfrOpCodeHeader; - DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", If= rCheckBox->Flags)); + DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", If= rCheckBox->Flags)); break; case EFI_IFR_NUMERIC_OP: IfrNumeric =3D (EFI_IFR_NUMERIC *) IfrOpCodeHeader; - DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", If= rNumeric->Flags)); + DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", If= rNumeric->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 =3D (EFI_IFR_ORDERED_LIST *) IfrOpCodeHea= der; - DEBUG ((EFI_D_INFO, " MaxContainers - 0x%02x\n", If= rOrderedList->MaxContainers)); - DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", If= rOrderedList->Flags)); + DEBUG ((DEBUG_INFO, " MaxContainers - 0x%02x\n", If= rOrderedList->MaxContainers)); + DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", If= rOrderedList->Flags)); break; default: break; } =20 @@ -249,30 +249,30 @@ DumpHiiPackage ( Scope =3D 1; while (Scope !=3D 0) { switch (IfrOpCodeHeader->OpCode) { case EFI_IFR_ONE_OF_OPTION_OP: IfrOneOfOption =3D (EFI_IFR_ONE_OF_OPTION *)IfrOpCod= eHeader; - DEBUG ((EFI_D_INFO, "!!!! IfrOpCodeHeader->OpCode= - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCod= eHeader->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 (IfrOpCod= eHeader->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; =20 - DEBUG ((EFI_D_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize)); + DEBUG ((DEBUG_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize)); HiiPackageListHeader =3D (EFI_HII_PACKAGE_LIST_HEADER *) HiiDatabase; =20 while ((UINTN) HiiPackageListHeader < ((UINTN) HiiDatabase + HiiDatabase= Size)) { - DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &H= iiPackageListHeader->PackageListGuid)); - DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageLength - 0x%x\n", = (UINTN)HiiPackageListHeader->PackageLength)); + DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &H= iiPackageListHeader->PackageListGuid)); + DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageLength - 0x%x\n", = (UINTN)HiiPackageListHeader->PackageLength)); HiiPackageHeader =3D (EFI_HII_PACKAGE_HEADER *)(HiiPackageListHeader += 1); =20 while ((UINTN) HiiPackageHeader < (UINTN) HiiPackageListHeader + HiiPa= ckageListHeader->PackageLength) { =20 DumpHiiPackage (HiiPackageHeader); @@ -503,11 +503,11 @@ MergeHiiQue= stion ( =20 ASSERT ((HiiQuestion1->OpCode =3D=3D HiiQuestion2->OpCode) && (HiiQuesti= on1->StorageWidth =3D=3D HiiQuestion2->StorageWidth)); =20 switch (HiiQuestion1->OpCode) { case EFI_IFR_ONE_OF_OP: - DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = =3D 0x%04x\n", HiiQuestion1->VarOffset)); + DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP=20 + VarOffset =3D 0x%04x\n", HiiQuestion1->VarOffset)); // // Get the length of Hii Question 1. // NewLength =3D HiiQuestion1->Length; =20 @@ -584,15 +584,15 @@ MergeHiiQuestion ( InternalVarCheckFreePool (HiiQuestion1); } break; =20 case EFI_IFR_CHECKBOX_OP: - DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffse= t =3D 0x%04x\n", HiiQuestion1->VarOffset)); + DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP=20 + VarOffset =3D 0x%04x\n", HiiQuestion1->VarOffset)); break; =20 case EFI_IFR_NUMERIC_OP: - DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset= =3D 0x%04x\n", HiiQuestion1->VarOffset)); + DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP=20 + VarOffset =3D 0x%04x\n", HiiQuestion1->VarOffset)); // // Get minimum and maximum of Hii Question 1. // Minimum1 =3D 0; Maximum1 =3D 0; @@ -628,11 +628,11 @@ MergeHiiQuestion ( CopyMem (Ptr, &Maximum1, HiiQuestion1->StorageWidth); } break; =20 case EFI_IFR_ORDERED_LIST_OP: - DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarO= ffset =3D 0x%04x\n", HiiQuestion1->VarOffset)); + DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP=20 + VarOffset =3D 0x%04x\n", HiiQuestion1->VarOffset)); // // Get the length of Hii Question 1. // NewLength =3D HiiQuestion1->Length; =20 @@ -1401,11 +1401,11 @@ BuildVarCheckHiiBin ( =20 HiiVariableNode->HiiVariable->Length =3D HiiVariableLength; BinSize +=3D HiiVariableLength; } =20 - DEBUG ((EFI_D_INFO, "VarCheckHiiBin - size =3D 0x%x\n", BinSize)); + DEBUG ((DEBUG_INFO, "VarCheckHiiBin - size =3D 0x%x\n", BinSize)); if (BinSize =3D=3D 0) { *Size =3D BinSize; return NULL; } =20 @@ -1414,11 +1414,11 @@ BuildVarCheckHiiBin ( // Only here AllocateRuntimeZeroPool () from MemoryAllocateLib is used f= or runtime access // in SetVariable check handler. // Data =3D AllocateRuntimeZeroPool (BinSize); ASSERT (Data !=3D NULL); - DEBUG ((EFI_D_INFO, "VarCheckHiiBin - built at 0x%x\n", Data)); + DEBUG ((DEBUG_INFO, "VarCheckHiiBin - built at 0x%x\n", Data)); =20 // // Gen Data // Ptr =3D Data; @@ -1463,11 +1463,11 @@ VarCheckHiiGen ( VarCheckHiiGenFromHiiDatabase (); VarCheckHiiGenFromFv (); =20 mVarCheckHiiBin =3D BuildVarCheckHiiBin (&mVarCheckHiiBinSize); if (mVarCheckHiiBin =3D=3D 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=20 + from *.dsc and *.fdf\n")); return; } =20 DestroyHiiVariableNode (); if (mVarName !=3D NULL) { diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/M= deModulePkg/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", Numbero= fMatchingVfrBin)); + DEBUG ((DEBUG_INFO , "FfsNameGuid - %g\n", DriverGuid)); + DEBUG ((DEBUG_INFO , "NumberofMatchingVfrBin - 0x%02x\n",=20 + NumberofMatchingVfrBin)); =20 for (VfrBinIndex =3D 0; VfrBinIndex < NumberofMatchingVfrBin; Vf= rBinIndex++) { #ifdef DUMP_HII_DATA DEBUG_CODE ( DumpHiiPackage ((UINT8 *) (UINTN) SectionBuffer + VfrBinBase= Address[VfrBinIndex] + sizeof (UINT32)); @@ -282,11 +282,11 @@ ParseFv ( =20 // // Search all FVs // for (Index =3D 0; Index < HandleCount; Index++) { - DEBUG ((EFI_D_INFO, "FvIndex - %x\n", Index)); + DEBUG ((DEBUG_INFO , "FvIndex - %x\n", Index)); Status =3D gBS->HandleProtocol ( HandleBuffer[Index], &gEfiFirmwareVolume2ProtocolGuid, (VOID **) &Fv2 ); @@ -303,13 +303,13 @@ ParseFv ( (VOID **) &Fvb2 ); ASSERT_EFI_ERROR (Status); Status =3D 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 =3D ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvL= ength; - DEBUG ((EFI_D_INFO, "FvSize - 0x%08x\n", FvSize)); + DEBUG ((DEBUG_INFO , "FvSize - 0x%08x\n", FvSize)); } ); =20 if (ScanAll) { // @@ -371,11 +371,11 @@ CreateVfrDriverList ( { UINTN Index; VAR_CHECK_VFR_DRIVER_INFO *VfrDriverInfo; =20 for (Index =3D 0; !IsZeroGuid (&DriverGuidArray[Index]); Index++) { - DEBUG ((EFI_D_INFO, "CreateVfrDriverList: %g\n", &DriverGuidArray[Ind= ex])); + DEBUG ((DEBUG_INFO , "CreateVfrDriverList: %g\n",=20 + &DriverGuidArray[Index])); VfrDriverInfo =3D InternalVarCheckAllocateZeroPool (sizeof (*VfrDrive= rInfo)); ASSERT (VfrDriverInfo !=3D NULL); VfrDriverInfo->Signature =3D VAR_CHECK_VFR_DRIVER_INFO_SIGNATURE; VfrDriverInfo->DriverGuid =3D &DriverGuidArray[Index]; InsertTailList (&mVfrDriverList, &VfrDriverInfo->Link); @@ -412,11 +4= 12,11 @@ VarCheckHiiGenFromFv ( ) { EFI_GUID *DriverGuidArray; BOOLEAN ScanAll; =20 - DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromFv\n")); + DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromFv\n")); =20 // // Get vfr driver guid array from PCD. // DriverGuidArray =3D (EFI_GUID *) PcdGetPtr (PcdVarCheckVfrDriverGuidArra= y); 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 =3D HiiDatabase->ExportPackageLists (HiiDatabase, 0, &BufferSiz= e, Buffer); ASSERT_EFI_ERROR (Status); =20 - DEBUG ((EFI_D_INFO, "VarCheckHiiGenDxeFromHii - HII Database exported = at 0x%x, size =3D 0x%x\n", Buffer, BufferSize)); + DEBUG ((DEBUG_INFO , "VarCheckHiiGenDxeFromHii - HII Database=20 + exported at 0x%x, size =3D 0x%x\n", Buffer, BufferSize)); =20 #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] =3D (CHAR8) ((TempByte < ' ' || TempByte > 'z') = ? '.' : TempByte); } =20 Val[Index * 3] =3D 0; Str[Index] =3D 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,=20 + Val, Str)); =20 Data +=3D Size; Offset +=3D Size; DataSize -=3D Size; } @@ -93,11 +93,11 @@ VarCheckHiiQuestion ( UINT8 *Ptr; UINT8 Index; UINT8 MaxContainers; =20 if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth) > Data= Size) { - DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + St= orageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->S= torageWidth, DataSize)); + DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x)=20 + + StorageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset,=20 + HiiQuestion->StorageWidth, DataSize)); return FALSE; } =20 OneData =3D 0; CopyMem (&OneData, (UINT8 *) Data + HiiQuestion->VarOffset, HiiQuestion-= >StorageWidth); @@ -118,19 +118,19 @@ VarCheckHiiQuestion ( } if ((UINTN) Ptr >=3D ((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=20 + (0x%lx)\n", OneData)); DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length,= (UINT8 *) HiiQuestion);); return FALSE; } break; =20 case EFI_IFR_CHECKBOX_OP: if ((OneData !=3D 0) && (OneData !=3D 1)) { - DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: CheckBox mismatch (= 0x%lx)\n", OneData)); + DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: CheckBox=20 + mismatch (0x%lx)\n", OneData)); DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length,= (UINT8 *) HiiQuestion);); return FALSE; } break; =20 @@ -145,20 +145,20 @@ VarCheckHiiQuestion ( =20 // // No need to check Step, because it is ONLY for UI. // if ((OneData < Minimum) || (OneData > Maximum)) { - DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: Numeric mismatch (0= x%lx)\n", OneData)); + DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: Numeric=20 + mismatch (0x%lx)\n", OneData)); DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length,= (UINT8 *) HiiQuestion);); return FALSE; } break; =20 case EFI_IFR_ORDERED_LIST_OP: MaxContainers =3D ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestio= n)->MaxContainers; if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth * M= axContainers) > DataSize) { - DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) = + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestio= n->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize)); + DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail:=20 + (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) >=20 + Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth,=20 + MaxContainers, DataSize)); return FALSE; } for (Index =3D 0; Index < MaxContainers; Index++) { OneData =3D 0; CopyMem (&OneData, (UINT8 *) Data + HiiQuestion->VarOffset + HiiQu= estion->StorageWidth * Index, HiiQuestion->StorageWidth); @@ -183,11 +183,1= 1 @@ VarCheckHiiQuestion ( } if ((UINTN) Ptr >=3D ((UINTN) HiiQuestion + HiiQuestion->Length)) = { // // No match // - DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: OrderedList misma= tch\n")); + DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OrderedList=20 + mismatch\n")); DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Stora= geWidth * MaxContainers, (UINT8 *) Data + HiiQuestion->VarOffset);); DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Lengt= h, (UINT8 *) HiiQuestion);); return FALSE; } } @@ -249,23 +249,23 @@ SetVariableCheckHandlerHii ( if ((StrCmp ((CHAR16 *) (HiiVariable + 1), VariableName) =3D=3D 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 =3D= 0x%08x Size =3D 0x%x\n", VariableName, VendorGuid, Attributes, DataSize)); + DEBUG ((DEBUG_INFO , "VarCheckHiiVariable - %s:%g with Attributes=20 + =3D 0x%08x Size =3D 0x%x\n", VariableName, VendorGuid, Attributes,=20 + DataSize)); if (HiiVariable->Attributes !=3D Attributes) { - DEBUG ((EFI_D_INFO, "VarCheckHiiVariable fail for Attributes - 0x%= 08x\n", HiiVariable->Attributes)); + DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Attributes -=20 + 0x%08x\n", HiiVariable->Attributes)); return EFI_SECURITY_VIOLATION; } =20 if (DataSize =3D=3D 0) { - DEBUG ((EFI_D_INFO, "VarCheckHiiVariable - CHECK PASS with DataSiz= e =3D=3D 0 !\n")); + DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - CHECK PASS with=20 + DataSize =3D=3D 0 !\n")); return EFI_SUCCESS; } =20 if (HiiVariable->Size !=3D DataSize) { - DEBUG ((EFI_D_INFO, "VarCheckHiiVariable fail for Size - 0x%x\n", = HiiVariable->Size)); + DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Size -=20 + 0x%x\n", HiiVariable->Size)); return EFI_SECURITY_VIOLATION; } =20 // // Do the check. @@ -280,11 +280,11 @@ SetVariableCheckHandlerHii ( // For Hii Question header align. // HiiQuestion =3D (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((= UINTN) HiiQuestion + HiiQuestion->Length)); } =20 - 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; =20 - DEBUG ((EFI_D_INFO, " VAR_CHECK_HII_QUESTION_HEADER\n")); - DEBUG ((EFI_D_INFO, " OpCode - 0x%02x (%a)\n", HiiQuestion->Op= Code, HiiOpCodeToStr (HiiQuestion->OpCode))); - DEBUG ((EFI_D_INFO, " Length - 0x%02x\n", HiiQuestion->Length)= ); - DEBUG ((EFI_D_INFO, " VarOffset - 0x%04x\n", HiiQuestion->VarOffs= et)); - DEBUG ((EFI_D_INFO, " StorageWidth - 0x%02x\n", HiiQuestion->Storage= Width)); + DEBUG ((DEBUG_INFO, " VAR_CHECK_HII_QUESTION_HEADER\n")); + DEBUG ((DEBUG_INFO, " OpCode - 0x%02x (%a)\n", HiiQuestion->Op= Code, HiiOpCodeToStr (HiiQuestion->OpCode))); + DEBUG ((DEBUG_INFO, " Length - 0x%02x\n", HiiQuestion->Length)= ); + DEBUG ((DEBUG_INFO, " VarOffset - 0x%04x\n", HiiQuestion->VarOffs= et)); + DEBUG ((DEBUG_INFO, " StorageWidth - 0x%02x\n", HiiQuestion->Storage= Width)); =20 switch (HiiQuestion->OpCode) { case EFI_IFR_ONE_OF_OP: Ptr =3D (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion + 1)= ; while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) { OneValue =3D 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 +=3D HiiQuestion->StorageWidth; =20 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; =20 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 =3D (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestio= n + 1); while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) { OneValue =3D 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; =20 - DEBUG ((EFI_D_INFO, "VAR_CHECK_HII_VARIABLE_HEADER\n")); - DEBUG ((EFI_D_INFO, " Revision - 0x%04x\n", HiiVariable->Revisio= n)); - DEBUG ((EFI_D_INFO, " HeaderLength - 0x%04x\n", HiiVariable->HeaderL= ength)); - DEBUG ((EFI_D_INFO, " Length - 0x%08x\n", HiiVariable->Length)= ); - DEBUG ((EFI_D_INFO, " OpCode - 0x%02x (%a)\n", HiiVariable->Op= Code, HiiOpCodeToStr (HiiVariable->OpCode))); - DEBUG ((EFI_D_INFO, " Size - 0x%04x\n", HiiVariable->Size)); - DEBUG ((EFI_D_INFO, " Attributes - 0x%08x\n", HiiVariable->Attribu= tes)); - 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->Revisio= n)); + DEBUG ((DEBUG_INFO, " HeaderLength - 0x%04x\n", HiiVariable->HeaderL= ength)); + DEBUG ((DEBUG_INFO, " Length - 0x%08x\n", HiiVariable->Length)= ); + DEBUG ((DEBUG_INFO, " OpCode - 0x%02x (%a)\n", HiiVariable->Op= Code, HiiOpCodeToStr (HiiVariable->OpCode))); + DEBUG ((DEBUG_INFO, " Size - 0x%04x\n", HiiVariable->Size)); + DEBUG ((DEBUG_INFO, " Attributes - 0x%08x\n", HiiVariable->Attribu= tes)); + DEBUG ((DEBUG_INFO, " Guid - %g\n", &HiiVariable->Guid)); + DEBUG ((DEBUG_INFO, " Name - %s\n", HiiVariable + 1)); =20 // // For Hii Question header align. // HiiQuestion =3D (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN)= HiiVariable + HiiVariable->HeaderLength)); @@ -496,11 +496,11 @@ DumpVarCh= eckHii ( IN UINTN VarCheckHiiBinSize ) { VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable; =20 - DEBUG ((EFI_D_INFO, "DumpVarCheckHii\n")); + DEBUG ((DEBUG_INFO, "DumpVarCheckHii\n")); =20 // // For Hii Variable header align. // HiiVariable =3D (VAR_CHECK_HII_VARIABLE_HEADER *) HEADER_ALIGN (VarCheck= HiiBin); -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel