From 2fa0e11df2504fea85e02f1b635f88a4d284bc6a Mon Sep 17 00:00:00 2001
From: Liming Gao <liming.gao@intel.com>
Date: Thu, 22 Sep 2016 10:03:42 +0800
Subject: 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>
---
 MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c      | 4 ++--
 MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf | 2 +-
 MdeModulePkg/Universal/SetupBrowserDxe/Setup.c             | 2 +-
 MdeModulePkg/Universal/SetupBrowserDxe/Setup.h             | 2 +-
 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'MdeModulePkg/Universal')

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index ea6b124f10..026e2c253e 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1952,7 +1952,7 @@ DriverSampleInit (
   EFI_STRING                      NameRequestHdr;
   MY_EFI_VARSTORE_DATA            *VarStoreConfig;
   EFI_INPUT_KEY                   HotKey;
-  EFI_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;
+  EDKII_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;
 
   //
   // Initialize the local variables.
@@ -2244,7 +2244,7 @@ DriverSampleInit (
   //
   // Example of how to use BrowserEx protocol to register HotKey.
   // 
-  Status = gBS->LocateProtocol (&gEfiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);
+  Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);
   if (!EFI_ERROR (Status)) {
     //
     // First unregister the default hot key F9 and F10.
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index f5c0b4670b..4233e635bc 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -91,7 +91,7 @@
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES
   gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES
-  gEfiFormBrowserExProtocolGuid                 ## CONSUMES
+  gEdkiiFormBrowserExProtocolGuid               ## CONSUMES
   gEfiConfigKeywordHandlerProtocolGuid          ## CONSUMES
 
 [Depex]
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 3f368b54ec..2aded895af 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -938,7 +938,7 @@ InitializeSetup (
   
   Status = gBS->InstallProtocolInterface (
                   &mPrivateData.Handle,
-                  &gEfiFormBrowserExProtocolGuid,
+                  &gEdkiiFormBrowserExProtocolGuid,
                   EFI_NATIVE_INTERFACE,
                   &mPrivateData.FormBrowserEx
                   );
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index cbc5401323..cc9f431e3b 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -90,7 +90,7 @@ typedef struct {
   // Produced protocol
   //
   EFI_FORM_BROWSER2_PROTOCOL            FormBrowser2;
-  EFI_FORM_BROWSER_EXTENSION_PROTOCOL   FormBrowserEx;
+  EDKII_FORM_BROWSER_EXTENSION_PROTOCOL FormBrowserEx;
 
   EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL FormBrowserEx2;
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 6aa728db03..012a39bee5 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -75,7 +75,7 @@
   ## CONSUMES
   ## NOTIFY
   gEdkiiFormDisplayEngineProtocolGuid
-  gEfiFormBrowserExProtocolGuid                 ## PRODUCES
+  gEdkiiFormBrowserExProtocolGuid               ## PRODUCES
   gEfiRegularExpressionProtocolGuid             ## CONSUMES
 
 [FeaturePcd]
-- 
cgit v1.2.3