From nobody Fri May 3 07:59:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+78677+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78677+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1628110050; cv=none; d=zohomail.com; s=zohoarc; b=JtKIj6FHcicaqeaw3xisumhvYJks+IwtRlWttEVqkf9UXHXgetWSpPInBr690U9+0Rc+grQorXpU5q/xJPZfXNfQDsLnkBKEnK0CiFU3D2CNaMqj2b8NundJqKfxiErQIjBeGMHSUdxfPTvGxsKpHlhzQmTkmYFuBw0SUZrdaAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628110050; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=a5QI6FTukqXFWB+/5h0LdKFqtX3e49N+tVnSkUlIHsI=; b=Ft2nJjt6jYViNdggaYcPhfNqSAniJWt8hR8blJIMCGK2UrNLDQltn/xu6czONDJxJyFyWvdtZNGGB0w7Y1vId5+w5+dAqeLqrnoHGqGwEOrArMeZ8Iy16/hKdxV/IWyN1dLxMDICe/g8mmyK/xBch6wHMaOsbocWT2uEVb3ZiOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78677+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 162811005007168.04359128925626; Wed, 4 Aug 2021 13:47:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Cc98YY1788612xe6p1TcTG7Y; Wed, 04 Aug 2021 13:47:29 -0700 X-Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by mx.groups.io with SMTP id smtpd.web08.92.1628109571473800229 for ; Wed, 04 Aug 2021 13:39:31 -0700 X-Received: by mail-qv1-f53.google.com with SMTP id f91so1756027qva.9 for ; Wed, 04 Aug 2021 13:39:31 -0700 (PDT) X-Gm-Message-State: mK6lmDAAbqChADnRmQdqRTzRx1787277AA= X-Google-Smtp-Source: ABdhPJyqEfro64dW0S3EoCRQHg92vSc+8yc5pHB0ObIuq9ZNmkSDGWQvL7Cda5v+qEtla+uqKY+WMg== X-Received: by 2002:a05:6214:e62:: with SMTP id jz2mr1332876qvb.54.1628109570603; Wed, 04 Aug 2021 13:39:30 -0700 (PDT) X-Received: from benjamind-benjamindomain.. ([2607:f2c0:e98c:24:3070:df1c:bdc9:1783]) by smtp.gmail.com with ESMTPSA id g206sm1940630qke.13.2021.08.04.13.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 13:39:30 -0700 (PDT) From: "Benjamin Doron" To: devel@edk2.groups.io Cc: Eric Dong , Liming Gao Subject: [edk2-devel] [edk2-platforms][PATCH v1] BoardModulePkg/BoardBdsHookLib: Simplify hotkey registration Date: Wed, 4 Aug 2021 16:39:12 -0400 Message-Id: <20210804203912.7544-1-benjamin.doron00@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,benjamin.doron00@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628110049; bh=RWnjOg/fYW50oaJaEQW7k6vxucCgIirlW1k0ZM0e+QY=; h=Cc:Date:From:Reply-To:Subject:To; b=A2p9098o6Kz0kpCDV9diyMfXQfDCNg3of1WU8G3g1z5EEsb5TnWvHiVcJRSfIkHcV/n n0JfZ5lNe/wVOgZ7dOqsuTgOXeG21k4QAEsv6L5ldxJx5LRPeF9JsPa57gapfVZ03mDcF QHA5gLQk6dyGVIIJd8aCthSGzFDbD1YK438= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628110051840100011 Content-Type: text/plain; charset="utf-8" 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/BoardBootOption= .c @@ -14,8 +14,6 @@ BOOLEAN mPxeBoot =3D FALSE; BOOLEAN mHotKeypressed =3D FALSE; EFI_EVENT HotKeyEvent =3D NULL; =20 -UINTN mBootMenuOptionNumber; - =20 /** This function will create a SHELL BootOption to boot. @@ -188,9 +186,6 @@ CreateFvBootOption ( EFI_GUID mUiFile =3D { 0x462CAA21, 0x7614, 0x4503, { 0x83, 0x6E, 0x8A, 0xB6, 0xF4, 0x66, 0x23, = 0x31 } }; -EFI_GUID mBootMenuFile =3D { - 0xEEC25BDC, 0x67F2, 0x4D95, { 0xB1, 0xD5, 0xF8, 0x1B, 0x20, 0x39, 0xD1, = 0x1D } -}; =20 =20 /** @@ -353,15 +348,6 @@ RegisterDefaultBootOption ( ShellDataSize =3D 0; RegisterFvBootOption (&gUefiShellFileGuid, INTERNAL_UEFI_SHELL_NA= ME, (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellDataSize); =20 - // - // Boot Menu - // - mBootMenuOptionNumber =3D RegisterFvBootOption (&mBootMenuFile, L"Boot D= evice List", (UINTN) -1, LOAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | = LOAD_OPTION_HIDDEN, NULL, 0); - - if (mBootMenuOptionNumber =3D=3D LoadOptionNumberUnassigned) { - DEBUG ((DEBUG_INFO, "BootMenuOptionNumber (%d) should not be same to L= oadOptionNumberUnassigned(%d).\n", mBootMenuOptionNumber, LoadOptionNumberU= nassigned)); - } - // // Boot Manager Menu // @@ -461,15 +447,14 @@ RegisterStaticHotkey ( Status =3D EfiBootManagerGetBootManagerMenu (&BootOption); ASSERT_EFI_ERROR (Status); RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F2.Key, TRU= E); - EfiBootManagerFreeLoadOption (&BootOption); =20 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) mBootMenuOptionNumber, &F7.Key, mBoot= MenuBoot); - + RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F7.Key, mBo= otMenuBoot); + EfiBootManagerFreeLoadOption (&BootOption); } =20 =20 --=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-