Hi Jian, Hao, Could you please help review the change. Thanks -------- Original message -------- From: "GuoMinJ via Groups.Io" > Date: Fri, Feb 21, 2020, 6:10 PM To: devel@edk2.groups.io Cc: GuoMinJ > Subject: [edk2-devel] [PATCH] MdeModulePkg: Remove gEfiFormBrowserExProtocolGuid Protocol Guid REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2145 Replace the gEfiFormBrowserExProtocolGuid with gEdkiiFormBrowserExProtocolGuid, remove the unnecessary declaration. Signed-off-by: GuoMinJ > --- MdeModulePkg/Include/Protocol/FormBrowserEx.h | 1 - MdeModulePkg/MdeModulePkg.ci.yaml | 1 - MdeModulePkg/MdeModulePkg.dec | 1 - MdePkg/MdePkg.ci.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h index c36aa6bdf1..e7e7cd18ab 100644 --- a/MdeModulePkg/Include/Protocol/FormBrowserEx.h +++ b/MdeModulePkg/Include/Protocol/FormBrowserEx.h @@ -143,7 +143,6 @@ struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL { SAVE_REMINDER SaveReminder; }; -extern EFI_GUID gEfiFormBrowserExProtocolGuid; extern EFI_GUID gEdkiiFormBrowserExProtocolGuid; #endif diff --git a/MdeModulePkg/MdeModulePkg.ci.yaml b/MdeModulePkg/MdeModulePkg.ci.yaml index 3b6e747075..d8cd13b384 100644 --- a/MdeModulePkg/MdeModulePkg.ci.yaml +++ b/MdeModulePkg/MdeModulePkg.ci.yaml @@ -53,7 +53,6 @@ "IgnoreGuidValue": ["00000000-0000-0000-0000-000000000000"], "IgnoreFoldersAndFiles": [], "IgnoreDuplicates": [ - "gEdkiiFormBrowserExProtocolGuid=gEfiFormBrowserExProtocolGuid", "gEfiPeiMmAccessPpiGuid=gPeiSmmAccessPpiGuid", "gPeiSmmControlPpiGuid=gEfiPeiMmControlPpiGuid", ] diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 91a3c60823..73ff177434 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -526,7 +526,6 @@ gEfiLockBoxProtocolGuid = { 0xbd445d79, 0xb7ad, 0x4f04, { 0x9a, 0xd8, 0x29, 0xbd, 0x20, 0x40, 0xeb, 0x3c }} ## Include/Protocol/FormBrowserEx.h - gEfiFormBrowserExProtocolGuid = { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } } gEdkiiFormBrowserExProtocolGuid = { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } } ## Include/Protocol/EbcVmTest.h diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml index 88e490fcb6..3268f15354 100644 --- a/MdePkg/MdePkg.ci.yaml +++ b/MdePkg/MdePkg.ci.yaml @@ -81,7 +81,6 @@ "gEfiDebugPortProtocolGuid=gEfiDebugPortVariableGuid=gEfiDebugPortDevicePathGuid", ## is this a bug "gEfiProcessorSpecificErrorSectionGuid=gEfiIa32X64ProcessorErrorSectionGuid", ## is this a bug "gEfiSmmPeriodicTimerDispatch2ProtocolGuid=gEfiMmPeriodicTimerDispatchProtocolGuid", - "gEdkiiFormBrowserExProtocolGuid=gEfiFormBrowserExProtocolGuid", "gEfiPeiMmAccessPpiGuid=gPeiSmmAccessPpiGuid", "gPeiSmmControlPpiGuid=gEfiPeiMmControlPpiGuid" ] -- 2.17.1