From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web08.33604.1628839440556794807 for ; Fri, 13 Aug 2021 00:24:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=cLNprOaR; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10074"; a="215247125" X-IronPort-AV: E=Sophos;i="5.84,318,1620716400"; d="scan'208";a="215247125" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2021 00:23:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,318,1620716400"; d="scan'208";a="677232436" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga005.fm.intel.com with ESMTP; 13 Aug 2021 00:23:59 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Fri, 13 Aug 2021 00:23:58 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Fri, 13 Aug 2021 00:23:58 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Fri, 13 Aug 2021 00:23:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HN0BLwTtfrPKUd976d6eAg0Tk0U+EolkxSoc2pVIeMNK6dYbYVY3x0jugrYkUvr4zmDiNIdgLbRaQpzV4v53OL9Yb22D8M78cR8T9LR0IOqrLi13v+6WuRtDXcNpNpVsCaMHlR1BTD+F+Ab/ysdRp6SjdAfl+0GROdM7JkIh509rVe9umW6iW7Xxeo51Swg3Z15pO/77cmikrOunMgH6Cd6iPCJZVgpyl7gmwU9bj667lj8oGNm/Cp3DfCPCPQe4S+sH9l8Ymoving5sc532DsETle9Zh3GfhaSJDXJFrNaDvJcx9WSz3m4vT1g/KW4TVKw5edguOR8JcDTHpMLikg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O9/uPEXtQX2x+Ldl9cqRrQx1rPXWHahdg0rPT447Jy0=; b=XXD0CZQLsfq2VRMyDRn2MGgkM87zbRpRs1I64lIVgLm/6oJ9jOdsGWIAfqIIi+nQ5HaGEzKX32oDmOx8jTxoRgoLyiiuLTwvxW9lLpqoOZqdGPDFjAZTPqiEEcQ2sM/IGf4km8nlPr69rn2SETecgcl+htN0K3o0ZX/OukF9bGPBlx53W3Bowii0Nhai+uIGOVA0U+BaeHZKVr87Zk0OGit45onBkh+k7jQ613wnBodb8WryEPKg1D2lWPMh4vcn2H5sZXhpBBfW2IxSCte3jhrBNbtaQvhzwa66J9W/7yJwDcsvk3Qm0iworkXrSM4TiH3+stuYc5xcKYhNpZlrDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O9/uPEXtQX2x+Ldl9cqRrQx1rPXWHahdg0rPT447Jy0=; b=cLNprOaR2gQyqsqjhmF6xV1+II2qDKTybmLhqwtwuWdZzW5OXgol/xcZ7RLIqxUhR02Pftlh1EHQ9aTT0haGQrfGGiLgzUdxtgE3NgLV0e0k7bl7UNtVOIWetNwi8u1yzxa+NhQxOBh5ydyMSN3BjFuoU7uQxetayZoeZYvutMY= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by MWHPR1101MB2207.namprd11.prod.outlook.com (2603:10b6:301:58::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.22; Fri, 13 Aug 2021 07:23:53 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::546c:f20e:35d2:65a7]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::546c:f20e:35d2:65a7%5]) with mapi id 15.20.4415.016; Fri, 13 Aug 2021 07:23:53 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "benjamin.doron00@gmail.com" CC: "Dong, Eric" , Liming Gao Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1] BoardModulePkg/BoardBdsHookLib: Simplify hotkey registration Thread-Topic: [edk2-devel] [edk2-platforms][PATCH v1] BoardModulePkg/BoardBdsHookLib: Simplify hotkey registration Thread-Index: AQHXiXH5aAuE0ERSM0e4tTwGydxgq6txFKSA Date: Fri, 13 Aug 2021 07:23:53 +0000 Message-ID: References: <20210804203912.7544-1-benjamin.doron00@gmail.com> In-Reply-To: <20210804203912.7544-1-benjamin.doron00@gmail.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e081f1ef-7527-408c-36ce-08d95e2b4e1b x-ms-traffictypediagnostic: MWHPR1101MB2207: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sql1jFgUKP5yvsqnsSztjDVlLxDPJOjOt2EFlNdttsdYOQMCuKpFC/0IVdKcpEWOr47ZEw1EQvG/N9qkRkjgZkXy29lI9M2KOjipv5UdTzwmjjADPuz5quAgNvST8OLrbAh8s6GZ4mZu3pqegKxs4OMowh95UtLGrPQwqI2PPxplizak4HRxfhR/f5omIXmXcyAfA9XCHU+4vbm4UR30CjEDBQnWnyohHD1knv+GXRfyEdXiDcmiUNrhwHBUdkC9JG/7jfeZpoTVywEezDpsjDjdb7OGVqRn96WPAVLSKsCVY0eyZ4GO+lsyPQDAXMN93eGbmvTm5V04lUamXrumzBs5t7VHvwkT3RdQaUkMtCQJvy9XLMcDWVDRlDXIkiKUTZ8A1kRdrm6jcZIaLFZ85E18cJqTQ5AxUGLp/V8PzrMXRuRuEfNKt//lc4OurawrXnFvdJaBEQHQy41OoyebEwuNJ84cQllfU5v31CfVifsaO9hdndaSa0LGNF4ra5HmW1plsVViZTJW6b0d4nXZxujzG/0GQWGrGNHnnV/aPwCCNrX0yMvQl+u9l3a3gF0RmpKHhEVIA4N+vYcSOlMNLT8ywqdAGz/nASuKLxnRhFLnAsBv7t7ZQ7IQNgpx8Ar8GX8Qu/2yHpNMI+e8K/KRa5rRUDlNKrwk5h8YJ9qL6ZqUfFlGoLdP0YfKOip0yg7usLilS1Pjz/JpepPKPkEAOd9czMYarkIeSoXZ9eCht75ArN9Gz99DzLm/YHUPrKLeXrQdwIAqmEN+Si334J+G0yayL9xVAlinqvHyDTonS0mj8/MisPtgzX1rqRQBSWSF7KK4Q21aGW3K3QlOhvrDaQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(366004)(346002)(39860400002)(376002)(136003)(71200400001)(8936002)(52536014)(8676002)(2906002)(966005)(19627235002)(478600001)(6506007)(53546011)(55016002)(5660300002)(9686003)(66446008)(66946007)(66476007)(66556008)(7696005)(64756008)(76116006)(86362001)(186003)(110136005)(316002)(4326008)(54906003)(122000001)(26005)(83380400001)(38100700002)(38070700005)(33656002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?4xS7xnsESPE/2MUhRngXDY2tX6YZ4E042FBUU+J6otWG6D+n2KrBU+bSOm06?= =?us-ascii?Q?XpAhNbeZl7rbFRK+yjqmPe1G5eRaGF0zz18wTRUn5uKkSzoKjMb/XUgDMJPV?= =?us-ascii?Q?JfoRG4XgXtrGmpgsD4d7y22Q/ZhmOETroP9T9bGONeMEgo3aPp/yOscNYIYN?= =?us-ascii?Q?iwg97yqXwd/TqMr83VU8tbyrLWlUojBPCCrjXLIXQybAmABiErtJmAiqrPk+?= =?us-ascii?Q?lKOsUXF8Qoa/Mt69pWcHgf/uDtwcm832jI213yZIK6YIu2ahwJtkfUdvAxlg?= =?us-ascii?Q?SevHm23EtOKjALBzkC6EK1E3km/KEepSneuxJmE5hLQbBu/JZDm3zCL/JKEj?= =?us-ascii?Q?zj8fT5+v7E0Cs4SIGVTmv+6w8W6pFAqf1A8cHJyOJPcqCfl7LnN7Ph6xe6oc?= =?us-ascii?Q?RNCREIpdnjjkMmax9GiwIN/lBh3J9V3hY/Z/2/5xGvwBb0WD/xTYM6wYnPBZ?= =?us-ascii?Q?t5o3jVqKRDlXXLgY1XJuILE/kCjf0r3aSG8voc7Awq/CJQMzEMJu7tjJ7VJG?= =?us-ascii?Q?zA5R3RXlX9+qHyJc8+2swa3Uij6cuYMg8zloVYFqOmeKbTifFiYHRM56wFnT?= =?us-ascii?Q?BFxaktTORUT6WJHqCl7ylLDwXflU4VPEUrSyBOiPYU2bpJd7EkGEZ4hX6tJQ?= =?us-ascii?Q?B2Fy6afcZCIbVEYgU85atUmvXamUzrBvsU1vPHzjY3h/skc2vHwtsOYI/WSs?= =?us-ascii?Q?rRUcJJNOcrKx/p19tRIL6Bt+JjHUREVka18fRQ+SK+82J43wvkj8pRKkdiMI?= =?us-ascii?Q?h7JwdulCYmLTA2jtKJ9Mfug91RZ4QGbVri8jU3GeuSeG4ibEe27lPaFkhLWe?= =?us-ascii?Q?dDJQVNArz8LcTElK/jZ+yj7LnYjh5mjh6Yc4XOmxR8rjxUSEX7VDB6ikBXiI?= =?us-ascii?Q?RiLfB4hcElNl0lKe+Za3k8SeA9MCJ72+7+SvatC3+SVO4xspXEs9es6LP4ao?= =?us-ascii?Q?gH8TN/WqZrGC78mxDNMheKkBOyMb2t8GqnI6n5sYVOkDgJSi1lw7MYG/w3up?= =?us-ascii?Q?kH2QAiBxGpApI9ytAO3XeuK+U/K8LJMQe/WhSnuiLnEprfHWJ7q1yihV+N6u?= =?us-ascii?Q?A5ENE64AQRe5VCfqd02Wi3IdJ8e/vheKvv9swoo3DGkT3eoexNpwJKZD26pI?= =?us-ascii?Q?2QpIKMaRe4baoPb5vBXSKBLTiUQr028BH+oCrhU5ImnS3BEbppVajtRmbWro?= =?us-ascii?Q?EcPAGPYA/xD3Q3/8096LlD800Ra48crneT+kh/ZfgV1ray0261I1U1CLgL2r?= =?us-ascii?Q?rh38KqVvCU+4J0qZjotl1F/hIb8J1DOO7V/hwQwqoE7cv56hpiXn3i4gloUv?= =?us-ascii?Q?loDwgsW3rd1LQI/e+z78m2RV?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e081f1ef-7527-408c-36ce-08d95e2b4e1b X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Aug 2021 07:23:53.5177 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: wtUcrp2PowBZZB4cZ7u9/f454onOqAyFPmykxEHDc696zne0J/nGQ6OiqHhX0wadp8icqlz2HH2m9WgIJf4nMPPKD11+r5oXgiZtKuipupA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2207 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Benjamin, This patch is unable to apply unless the content of your other patch https:= //edk2.groups.io/g/devel/message/78309 has already been merged. Accordingly= , after you address my feedback on the first patch please send this patch a= s part of the same patch series so it can be applied cleanly. Thanks, Nate -----Original Message----- From: devel@edk2.groups.io On Behalf Of Benjamin Dor= on Sent: Wednesday, August 4, 2021 1:39 PM To: devel@edk2.groups.io Cc: Dong, Eric ; Liming Gao Subject: [edk2-devel] [edk2-platforms][PATCH v1] BoardModulePkg/BoardBdsHoo= kLib: Simplify hotkey registration If BootOption free is delayed, hotkey registration can be simplified. There will be no need to register an additional boot option. Tested, both F2 and F7 keys still open the list of boot options. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Benjamin Doron --- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c | = 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index 2dd0b250d44e..df60f6903a22 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOpt +++ ion.c @@ -14,8 +14,6 @@ BOOLEAN mPxeBoot =3D FALSE; BOOLEAN mHotKeypressed =3D FALSE; EFI_EVENT HotKeyEvent =3D NULL; -= UINTN mBootMenuOptionNumber;- /** This function will create a SHELL= BootOption to boot.@@ -188,9 +186,6 @@ CreateFvBootOption ( EFI_GUID mUiFile =3D { 0x462CAA21, 0x7614, 0x4503, { 0x83, 0x6E, 0x8A, 0= xB6, 0xF4, 0x66, 0x23, 0x31 } };-EFI_GUID mBootMenuFile =3D {- 0xEEC25BDC,= 0x67F2, 0x4D95, { 0xB1, 0xD5, 0xF8, 0x1B, 0x20, 0x39, 0xD1, 0x1D }-}; /*= *@@ -353,15 +348,6 @@ RegisterDefaultBootOption ( ShellDataSize =3D 0; RegisterFvBootOption (&gUefiShellFileGuid, = INTERNAL_UEFI_SHELL_NAME, (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)Shell= Data, ShellDataSize); - //- // Boot Menu- //- mBootMenuOptionNumber =3D= RegisterFvBootOption (&mBootMenuFile, L"Boot Device List", (UINTN) -1, L= OAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | LOAD_OPTION_HIDDEN, NULL, 0)= ;-- if (mBootMenuOptionNumber =3D=3D LoadOptionNumberUnassigned) {- DEB= UG ((DEBUG_INFO, "BootMenuOptionNumber (%d) should not be same to LoadOptio= nNumberUnassigned(%d).\n", mBootMenuOptionNumber, LoadOptionNumberUnassigne= d));- }- // // Boot Manager Menu //@@ -461,15 +447,14 @@ RegisterSta= ticHotkey ( Status =3D EfiBootManagerGetBootManagerMenu (&BootOption); ASSERT_EFI_= ERROR (Status); RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumbe= r, &F2.Key, TRUE);- EfiBootManagerFreeLoadOption (&BootOption); F7.Key.= ScanCode =3D SCAN_F7; F7.Key.UnicodeChar =3D CHAR_NULL; F7.KeyState.= KeyShiftState =3D EFI_SHIFT_STATE_VALID; F7.KeyState.KeyToggleState =3D 0= ; mBootMenuBoot =3D !EnterSetup;- RegisterBootOptionHotkey ((UINT16) mB= ootMenuOptionNumber, &F7.Key, mBootMenuBoot);-+ RegisterBootOptionHotkey (= (UINT16) BootOption.OptionNumber, &F7.Key, mBootMenuBoot);+ EfiBootManager= FreeLoadOption (&BootOption); } --=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#78677): https://edk2.groups.io/g/devel/message/78677 Mute This Topic: https://groups.io/mt/84671368/1767664 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [nathaniel.l.desimone@int= el.com] -=3D-=3D-=3D-=3D-=3D-=3D