MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix

EDKII implementation protocol should be with EDKII_ prefix.

V2: add gEdkiiFormBrowserExProtocolGuid to align its structure name.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index ef3e8cbceba7b83ef36f572972cdbae897165e53..512de448d33b43e78565c364c9d0cf7f63dbd36a 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx.h
+++ b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
@@ -2,7 +2,7 @@
   Extension Form Browser Protocol provides the services that can be used to \r
   register the different hot keys for the standard Browser actions described in UEFI specification.\r
 \r
-Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r
 The full text of the license may be found at\r
@@ -19,7 +19,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define FORM_BROWSER_EXTENSION_PROTOCOL_GUID  \\r
   { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } }\r
 \r
-typedef struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL   EFI_FORM_BROWSER_EXTENSION_PROTOCOL;\r
+typedef struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL   EDKII_FORM_BROWSER_EXTENSION_PROTOCOL;\r
+\r
+//\r
+// To be compatible, keep EFI_FORM_BROWSER_EXTENSION_PROTOCOL definition\r
+//\r
+typedef EDKII_FORM_BROWSER_EXTENSION_PROTOCOL   EFI_FORM_BROWSER_EXTENSION_PROTOCOL;\r
 \r
 //\r
 // Return value of SAVE_REMINDER() that describes whether the changed data is saved or discarded.\r
@@ -137,7 +142,7 @@ UINT32
   VOID\r
   );\r
 \r
-struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL {\r
+struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL {\r
   SET_SCOPE              SetScope;\r
   REGISTER_HOT_KEY       RegisterHotKey;\r
   REGISTER_EXIT_HANDLER  RegiserExitHandler;\r
@@ -145,6 +150,7 @@ struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL {
 };\r
 \r
 extern EFI_GUID gEfiFormBrowserExProtocolGuid;\r
+extern EFI_GUID gEdkiiFormBrowserExProtocolGuid;\r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 270088c2e6a31deda75e218bb2bef632afc906a5..bd375f40467086e58c71cf951178af216513d3ec 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -459,6 +459,7 @@
 \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
   gEfiEbcVmTestProtocolGuid = { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } }\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index ea6b124f10ba1e4a398311a12fcc64105fdf4d6d..026e2c253eacea6cfbf1ee11ddd357bee1026297 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1952,7 +1952,7 @@ DriverSampleInit (
   EFI_STRING                      NameRequestHdr;\r
   MY_EFI_VARSTORE_DATA            *VarStoreConfig;\r
   EFI_INPUT_KEY                   HotKey;\r
-  EFI_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;\r
+  EDKII_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;\r
 \r
   //\r
   // Initialize the local variables.\r
@@ -2244,7 +2244,7 @@ DriverSampleInit (
   //\r
   // Example of how to use BrowserEx protocol to register HotKey.\r
   // \r
-  Status = gBS->LocateProtocol (&gEfiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);\r
+  Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // First unregister the default hot key F9 and F10.\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index f5c0b4670b30246682d2145b931182ce3364f9f1..4233e635bc39f8433099cd3e6f1327036b759162 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -91,7 +91,7 @@
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES\r
   gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES\r
-  gEfiFormBrowserExProtocolGuid                 ## CONSUMES\r
+  gEdkiiFormBrowserExProtocolGuid               ## CONSUMES\r
   gEfiConfigKeywordHandlerProtocolGuid          ## CONSUMES\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 3f368b54ec7d6b67d1fe546aaa575d198fc5edde..2aded895afc5023324aeb891275eeaf653ab7a1e 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -938,7 +938,7 @@ InitializeSetup (
   \r
   Status = gBS->InstallProtocolInterface (\r
                   &mPrivateData.Handle,\r
-                  &gEfiFormBrowserExProtocolGuid,\r
+                  &gEdkiiFormBrowserExProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &mPrivateData.FormBrowserEx\r
                   );\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index cbc5401323bbf3142cd8957f8894b3ff1541c429..cc9f431e3bf57c02567eac7c22f865e8eb04f356 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -90,7 +90,7 @@ typedef struct {
   // Produced protocol\r
   //\r
   EFI_FORM_BROWSER2_PROTOCOL            FormBrowser2;\r
-  EFI_FORM_BROWSER_EXTENSION_PROTOCOL   FormBrowserEx;\r
+  EDKII_FORM_BROWSER_EXTENSION_PROTOCOL FormBrowserEx;\r
 \r
   EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL FormBrowserEx2;\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 6aa728db03493156bfbeac3f823d9a8a40c1fac4..012a39bee5df78a962327af1e3490359a34fee74 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -75,7 +75,7 @@
   ## CONSUMES\r
   ## NOTIFY\r
   gEdkiiFormDisplayEngineProtocolGuid\r
-  gEfiFormBrowserExProtocolGuid                 ## PRODUCES\r
+  gEdkiiFormBrowserExProtocolGuid               ## PRODUCES\r
   gEfiRegularExpressionProtocolGuid             ## CONSUMES\r
 \r
 [FeaturePcd]\r