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 <newexplorerj@gmail.com>
Acked-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index c36aa6bdf1381547e71b442671198b49b15f5888..e7e7cd18ab2d5ee45b0f65d686855f7e0e3fa7a5 100644 (file)
--- 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;\r
 };\r
 \r
-extern EFI_GUID gEfiFormBrowserExProtocolGuid;\r
 extern EFI_GUID gEdkiiFormBrowserExProtocolGuid;\r
 \r
 #endif\r

diff --git a/MdeModulePkg/MdeModulePkg.ci.yaml b/MdeModulePkg/MdeModulePkg.ci.yaml
index 3b6e747075719bdbf50d7f5e81921dfaa480815b..d8cd13b384607e4b4659580a011a3b9479e07dbf 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.ci.yaml
+++ b/MdeModulePkg/MdeModulePkg.ci.yaml
@@ -53,7 +53,6 @@
         "IgnoreGuidValue": ["00000000-0000-0000-0000-000000000000"],\r
         "IgnoreFoldersAndFiles": [],\r
         "IgnoreDuplicates": [\r
-            "gEdkiiFormBrowserExProtocolGuid=gEfiFormBrowserExProtocolGuid",\r
             "gEfiPeiMmAccessPpiGuid=gPeiSmmAccessPpiGuid",\r
             "gPeiSmmControlPpiGuid=gEfiPeiMmControlPpiGuid",\r
         ]\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 91a3c608231cb62e4a5b0155e70be5eec6134165..73ff1774345a9346732c25b1be70e6519ce7eb3e 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -526,7 +526,6 @@
   gEfiLockBoxProtocolGuid        = { 0xbd445d79, 0xb7ad, 0x4f04, { 0x9a, 0xd8, 0x29, 0xbd, 0x20, 0x40, 0xeb, 0x3c }}\r
 \r
   ## Include/Protocol/FormBrowserEx.h\r
-  gEfiFormBrowserExProtocolGuid = { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } }\r
   gEdkiiFormBrowserExProtocolGuid = { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } }\r
 \r
   ## Include/Protocol/EbcVmTest.h\r

diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml
index 88e490fcb66b7f7363aeb8a8fe16d72354b21e66..3268f1535499b21fa649ce60ce5ca0ccd0a0ff3e 100644 (file)
--- a/MdePkg/MdePkg.ci.yaml
+++ b/MdePkg/MdePkg.ci.yaml
@@ -81,7 +81,6 @@
             "gEfiDebugPortProtocolGuid=gEfiDebugPortVariableGuid=gEfiDebugPortDevicePathGuid", ## is this a bug\r
             "gEfiProcessorSpecificErrorSectionGuid=gEfiIa32X64ProcessorErrorSectionGuid",  ## is this a bug\r
             "gEfiSmmPeriodicTimerDispatch2ProtocolGuid=gEfiMmPeriodicTimerDispatchProtocolGuid",\r
-            "gEdkiiFormBrowserExProtocolGuid=gEfiFormBrowserExProtocolGuid",\r
             "gEfiPeiMmAccessPpiGuid=gPeiSmmAccessPpiGuid",\r
             "gPeiSmmControlPpiGuid=gEfiPeiMmControlPpiGuid"\r
             ]\r