tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Liming Gao 2016-09-22 10:03:42 +08:00
parent 053f31e3d0
commit 2fa0e11df2
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MdeModulePkg/Include/Protocol/FormBrowserEx.h
View File

@ -2,7 +2,7 @@
Extension Form Browser Protocol provides the services that can be used to 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. 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 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 terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at 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 \ #define FORM_BROWSER_EXTENSION_PROTOCOL_GUID \
{ 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } } { 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. // Return value of SAVE_REMINDER() that describes whether the changed data is saved or discarded.
@ -137,7 +142,7 @@ UINT32
VOID VOID
); );
struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL { struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL {
SET_SCOPE SetScope; SET_SCOPE SetScope;
REGISTER_HOT_KEY RegisterHotKey; REGISTER_HOT_KEY RegisterHotKey;
REGISTER_EXIT_HANDLER RegiserExitHandler; REGISTER_EXIT_HANDLER RegiserExitHandler;
@ -145,6 +150,7 @@ struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL {
}; };
extern EFI_GUID gEfiFormBrowserExProtocolGuid; extern EFI_GUID gEfiFormBrowserExProtocolGuid;
extern EFI_GUID gEdkiiFormBrowserExProtocolGuid;
#endif #endif

1
MdeModulePkg/MdeModulePkg.dec
View File

@ -459,6 +459,7 @@
## Include/Protocol/FormBrowserEx.h ## Include/Protocol/FormBrowserEx.h
gEfiFormBrowserExProtocolGuid = { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } } 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 ## Include/Protocol/EbcVmTest.h
gEfiEbcVmTestProtocolGuid = { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } } gEfiEbcVmTestProtocolGuid = { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } }

4
MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
View File

@ -1952,7 +1952,7 @@ DriverSampleInit (
EFI_STRING NameRequestHdr; EFI_STRING NameRequestHdr;
MY_EFI_VARSTORE_DATA *VarStoreConfig; MY_EFI_VARSTORE_DATA *VarStoreConfig;
EFI_INPUT_KEY HotKey; EFI_INPUT_KEY HotKey;
EFI_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx; EDKII_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;
// //
// Initialize the local variables. // Initialize the local variables.
@ -2244,7 +2244,7 @@ DriverSampleInit (
// //
// Example of how to use BrowserEx protocol to register HotKey. // 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)) { if (!EFI_ERROR (Status)) {
// //
// First unregister the default hot key F9 and F10. // First unregister the default hot key F9 and F10.

2
MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
View File

@ -91,7 +91,7 @@
gEfiFormBrowser2ProtocolGuid ## CONSUMES gEfiFormBrowser2ProtocolGuid ## CONSUMES
gEfiHiiDatabaseProtocolGuid ## CONSUMES gEfiHiiDatabaseProtocolGuid ## CONSUMES
gEfiSimpleTextInputExProtocolGuid ## SOMETIMES_CONSUMES gEfiSimpleTextInputExProtocolGuid ## SOMETIMES_CONSUMES
gEfiFormBrowserExProtocolGuid ## CONSUMES gEdkiiFormBrowserExProtocolGuid ## CONSUMES
gEfiConfigKeywordHandlerProtocolGuid ## CONSUMES gEfiConfigKeywordHandlerProtocolGuid ## CONSUMES
[Depex] [Depex]

2
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -938,7 +938,7 @@ InitializeSetup (
Status = gBS->InstallProtocolInterface ( Status = gBS->InstallProtocolInterface (
&mPrivateData.Handle, &mPrivateData.Handle,
&gEfiFormBrowserExProtocolGuid, &gEdkiiFormBrowserExProtocolGuid,
EFI_NATIVE_INTERFACE, EFI_NATIVE_INTERFACE,
&mPrivateData.FormBrowserEx &mPrivateData.FormBrowserEx
); );

2
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
View File

@ -90,7 +90,7 @@ typedef struct {
// Produced protocol // Produced protocol
// //
EFI_FORM_BROWSER2_PROTOCOL FormBrowser2; EFI_FORM_BROWSER2_PROTOCOL FormBrowser2;
EFI_FORM_BROWSER_EXTENSION_PROTOCOL FormBrowserEx; EDKII_FORM_BROWSER_EXTENSION_PROTOCOL FormBrowserEx;
EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL FormBrowserEx2; EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL FormBrowserEx2;

2
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
View File

@ -75,7 +75,7 @@
## CONSUMES ## CONSUMES
## NOTIFY ## NOTIFY
gEdkiiFormDisplayEngineProtocolGuid gEdkiiFormDisplayEngineProtocolGuid
gEfiFormBrowserExProtocolGuid ## PRODUCES gEdkiiFormBrowserExProtocolGuid ## PRODUCES
gEfiRegularExpressionProtocolGuid ## CONSUMES gEfiRegularExpressionProtocolGuid ## CONSUMES
[FeaturePcd] [FeaturePcd]