From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 52E461A1E1B for ; Mon, 26 Sep 2016 01:00:56 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP; 26 Sep 2016 01:00:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,398,1470726000"; d="scan'208";a="13317487" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 26 Sep 2016 01:00:55 -0700 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 26 Sep 2016 01:00:55 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 26 Sep 2016 01:00:55 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.118]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.101]) with mapi id 14.03.0248.002; Mon, 26 Sep 2016 16:00:53 +0800 From: "Tian, Feng" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Tian, Feng" Thread-Topic: [PATCH v2] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix Thread-Index: AQHSFUsSqevm3yml1kWCfoqyrAGjVaCLbZIw Date: Mon, 26 Sep 2016 08:00:52 +0000 Message-ID: <7F1BAD85ADEA444D97065A60D2E97EE566E2277B@SHSMSX101.ccr.corp.intel.com> References: <1474509892-12568-1-git-send-email-liming.gao@intel.com> <1474601518-13732-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1474601518-13732-1-git-send-email-liming.gao@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2] MdeModulePkg FormBrowserEx: Change its structure name with EDKII_ prefix X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Sep 2016 08:00:56 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Feng Tian Thanks Feng -----Original Message----- From: Gao, Liming=20 Sent: Friday, September 23, 2016 11:32 AM To: edk2-devel@lists.01.org Cc: Dong, Eric ; Tian, Feng Subject: [PATCH v2] MdeModulePkg FormBrowserEx: Change its structure name w= ith EDKII_ prefix EDKII implementation protocol should be with EDKII_ prefix. V2: add gEdkiiFormBrowserExProtocolGuid to align its structure name. Cc: Eric Dong Cc: Feng Tian Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- 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/I= nclude/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 t= o=20 register the different hot keys for the standard Browser actions describ= ed in UEFI specification. =20 -Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availabl= e under the terms and conditions of the BSD License that accompanies this = distribution. =20 The full text of the license may be found at @@ -19,7 +19,12 @@ WITHOUT WA= RRANTIES 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 } } =20 -typedef struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL EFI_FORM_BROWSER_EXT= ENSION_PROTOCOL; +typedef struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL EDKII_FORM_BROWSER= _EXTENSION_PROTOCOL; + +// +// To be compatible, keep EFI_FORM_BROWSER_EXTENSION_PROTOCOL=20 +definition // +typedef EDKII_FORM_BROWSER_EXTENSION_PROTOCOL EFI_FORM_BROWSER_EXTENSION= _PROTOCOL; =20 // // Return value of SAVE_REMINDER() that describes whether the changed data= is saved or discarded. @@ -137,7 +142,7 @@ UINT32 VOID ); =20 -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 _E= FI_FORM_BROWSER_EXTENSION_PROTOCOL { }; =20 extern EFI_GUID gEfiFormBrowserExProtocolGuid; +extern EFI_GUID gEdkiiFormBrowserExProtocolGuid; =20 #endif =20 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 @@ =20 ## Include/Protocol/FormBrowserEx.h gEfiFormBrowserExProtocolGuid =3D { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, = 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } } + gEdkiiFormBrowserExProtocolGuid =3D { 0x1f73b18d, 0x4630, 0x43c1, {=20 + 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } } =20 ## Include/Protocol/EbcVmTest.h gEfiEbcVmTestProtocolGuid =3D { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10= , 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } } diff --git a/MdeModulePkg/Universa= l/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/D= riverSample.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; =20 // // Initialize the local variables. @@ -2244,7 +2244,7 @@ DriverSampleInit ( // // Example of how to use BrowserEx protocol to register HotKey. // - Status =3D gBS->LocateProtocol (&gEfiFormBrowserExProtocolGuid, NULL, (V= OID **) &FormBrowserEx); + Status =3D gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL,= =20 + (VOID **) &FormBrowserEx); if (!EFI_ERROR (Status)) { // // First unregister the default hot key F9 and F10. diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/M= deModulePkg/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 =20 [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 ( =20 Status =3D 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; =20 EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL FormBrowserEx2; =20 diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/M= deModulePkg/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 =20 [FeaturePcd] -- 2.8.0.windows.1