Re: [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix


Dong, Eric
 

Reviewed-by: Eric Dong <eric.dong@...>

-----Original Message-----
From: Gao, Liming
Sent: Thursday, September 22, 2016 10:05 AM
To: edk2-devel@...
Cc: Dong, Eric; Tian, Feng
Subject: [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix

EDKII implementation protocol should be with EDKII_ prefix.

Cc: Eric Dong <eric.dong@...>
Cc: Feng Tian <feng.tian@...>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@...>
---
MdeModulePkg/Include/Protocol/FormBrowserEx.h | 11 ++++++++---
MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c | 2 +-
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index ef3e8cb..06ca50b 100644
--- 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
register the different hot keys for the standard Browser actions described in UEFI specification.

-Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
@@ -19,7 +19,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define FORM_BROWSER_EXTENSION_PROTOCOL_GUID \
{ 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } }

-typedef struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL EFI_FORM_BROWSER_EXTENSION_PROTOCOL;
+typedef struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL EDKII_FORM_BROWSER_EXTENSION_PROTOCOL;
+
+//
+// To be compatible, keep EFI_FORM_BROWSER_EXTENSION_PROTOCOL definition
+//
+typedef EDKII_FORM_BROWSER_EXTENSION_PROTOCOL EFI_FORM_BROWSER_EXTENSION_PROTOCOL;

//
// Return value of SAVE_REMINDER() that describes whether the changed data is saved or discarded.
@@ -137,7 +142,7 @@ UINT32
VOID
);

-struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL {
+struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL {
SET_SCOPE SetScope;
REGISTER_HOT_KEY RegisterHotKey;
REGISTER_EXIT_HANDLER RegiserExitHandler;
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index ea6b124..a52c577 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.
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index cbc5401..cc9f431 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;

--
2.8.0.windows.1

Join devel@edk2.groups.io to automatically receive all group messages.