* [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix @ 2016-09-22 2:04 Liming Gao 2016-09-22 2:39 ` Dong, Eric ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Liming Gao @ 2016-09-22 2:04 UTC (permalink / raw) To: edk2-devel; +Cc: Eric Dong, Feng Tian EDKII implementation protocol should be with EDKII_ prefix. 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> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix 2016-09-22 2:04 [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix Liming Gao @ 2016-09-22 2:39 ` Dong, Eric 2016-09-22 2:44 ` Zeng, Star 2016-09-23 3:31 ` [PATCH v2] " Liming Gao 2 siblings, 0 replies; 6+ messages in thread From: Dong, Eric @ 2016-09-22 2:39 UTC (permalink / raw) To: Gao, Liming, edk2-devel@lists.01.org; +Cc: Tian, Feng Reviewed-by: Eric Dong <eric.dong@intel.com> > -----Original Message----- > From: Gao, Liming > Sent: Thursday, September 22, 2016 10:05 AM > To: edk2-devel@lists.01.org > 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@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> > --- > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix 2016-09-22 2:04 [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix Liming Gao 2016-09-22 2:39 ` Dong, Eric @ 2016-09-22 2:44 ` Zeng, Star 2016-09-22 2:49 ` Gao, Liming 2016-09-23 3:31 ` [PATCH v2] " Liming Gao 2 siblings, 1 reply; 6+ messages in thread From: Zeng, Star @ 2016-09-22 2:44 UTC (permalink / raw) To: Gao, Liming, edk2-devel@lists.01.org; +Cc: Tian, Feng, Dong, Eric, Zeng, Star Is there change needed to gEfiFormBrowserExProtocolGuid in FormBrowserEx.h and MdeModulePkg.dec? Thanks, Star -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming Gao Sent: Thursday, September 22, 2016 10:05 AM To: edk2-devel@lists.01.org Cc: Tian, Feng <feng.tian@intel.com>; Dong, Eric <eric.dong@intel.com> Subject: [edk2] [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix EDKII implementation protocol should be with EDKII_ prefix. 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> --- 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 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix 2016-09-22 2:44 ` Zeng, Star @ 2016-09-22 2:49 ` Gao, Liming 0 siblings, 0 replies; 6+ messages in thread From: Gao, Liming @ 2016-09-22 2:49 UTC (permalink / raw) To: Zeng, Star, edk2-devel@lists.01.org; +Cc: Tian, Feng, Dong, Eric Good comments. GuidCName should be changed to align its C definition, and keep gEfiFormBrowserExProtocolGuid for compatibility. Thanks Liming > -----Original Message----- > From: Zeng, Star > Sent: Thursday, September 22, 2016 10:45 AM > To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org > Cc: Tian, Feng <feng.tian@intel.com>; Dong, Eric <eric.dong@intel.com>; > Zeng, Star <star.zeng@intel.com> > Subject: RE: [edk2] [Patch] MdeModulePkg FormBrowserEx: Change its > structure name with EDKII_ prefix > > Is there change needed to gEfiFormBrowserExProtocolGuid in > FormBrowserEx.h and MdeModulePkg.dec? > > Thanks, > Star > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Liming Gao > Sent: Thursday, September 22, 2016 10:05 AM > To: edk2-devel@lists.01.org > Cc: Tian, Feng <feng.tian@intel.com>; Dong, Eric <eric.dong@intel.com> > Subject: [edk2] [Patch] MdeModulePkg FormBrowserEx: Change its > structure name with EDKII_ prefix > > EDKII implementation protocol should be with EDKII_ prefix. > > 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> > --- > 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 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix 2016-09-22 2:04 [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix Liming Gao 2016-09-22 2:39 ` Dong, Eric 2016-09-22 2:44 ` Zeng, Star @ 2016-09-23 3:31 ` Liming Gao 2016-09-26 8:00 ` Tian, Feng 2 siblings, 1 reply; 6+ messages in thread From: Liming Gao @ 2016-09-23 3:31 UTC (permalink / raw) To: edk2-devel; +Cc: Eric Dong, Feng Tian 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> --- MdeModulePkg/Include/Protocol/FormBrowserEx.h | 12 +++++++++--- MdeModulePkg/MdeModulePkg.dec | 1 + 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 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h index ef3e8cb..512de44 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; @@ -145,6 +150,7 @@ struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL { }; extern EFI_GUID gEfiFormBrowserExProtocolGuid; +extern EFI_GUID gEdkiiFormBrowserExProtocolGuid; #endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 8d90f16..9c16222 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -459,6 +459,7 @@ ## Include/Protocol/FormBrowserEx.h 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 gEfiEbcVmTestProtocolGuid = { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } } diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c index ea6b124..026e2c2 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 f5c0b46..4233e63 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 3f368b5..2aded89 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 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; diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 6aa728d..012a39b 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] -- 2.8.0.windows.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix 2016-09-23 3:31 ` [PATCH v2] " Liming Gao @ 2016-09-26 8:00 ` Tian, Feng 0 siblings, 0 replies; 6+ messages in thread From: Tian, Feng @ 2016-09-26 8:00 UTC (permalink / raw) To: Gao, Liming, edk2-devel@lists.01.org; +Cc: Dong, Eric, Tian, Feng Reviewed-by: Feng Tian <feng.tian@intel.com> Thanks Feng -----Original Message----- From: Gao, Liming Sent: Friday, September 23, 2016 11:32 AM To: edk2-devel@lists.01.org Cc: Dong, Eric <eric.dong@intel.com>; Tian, Feng <feng.tian@intel.com> Subject: [PATCH v2] 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> --- MdeModulePkg/Include/Protocol/FormBrowserEx.h | 12 +++++++++--- MdeModulePkg/MdeModulePkg.dec | 1 + 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 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h index ef3e8cb..512de44 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; @@ -145,6 +150,7 @@ struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL { }; extern EFI_GUID gEfiFormBrowserExProtocolGuid; +extern EFI_GUID gEdkiiFormBrowserExProtocolGuid; #endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 8d90f16..9c16222 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -459,6 +459,7 @@ ## Include/Protocol/FormBrowserEx.h 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 gEfiEbcVmTestProtocolGuid = { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } } diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c index ea6b124..026e2c2 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 f5c0b46..4233e63 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 3f368b5..2aded89 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 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; diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 6aa728d..012a39b 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] -- 2.8.0.windows.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-26 8:00 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-22 2:04 [Patch] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix Liming Gao 2016-09-22 2:39 ` Dong, Eric 2016-09-22 2:44 ` Zeng, Star 2016-09-22 2:49 ` Gao, Liming 2016-09-23 3:31 ` [PATCH v2] " Liming Gao 2016-09-26 8:00 ` Tian, Feng
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox