From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RXEratsW; spf=pass (domain: gmail.com, ip: 209.85.219.53, mailfrom: benjamin.doron00@gmail.com) Received: by mail-qv1-f53.google.com with SMTP id f91so1756027qva.9 for ; Wed, 04 Aug 2021 13:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5svdymI2gvt1okpGw3+2KcMOeeGRLNSv/PifUcd0j3A=; b=RXEratsWUAnhHx2okf/He182MQ4dDCCptJxxrjTA6phHiYqgCQd8liaOsx2cb5UZbh Xad8OiZUfccDjyNLcyGub6LFhoq82hw3QGUP8OJ6swnoU5QIpzc++gD72E6nrNsW3XEQ INJtaTbZndfZS8xq3V2VPR0d8Ds/MSmUDEcYPXsA5ZnJ1oY2pjeLA4Doci5Nl2aYb4nu A4NXmG4hYhhzNwl6HyyspCSgi8Eqmr/eLUREVRRxyKUDDzaYUeqjMKRlzv467mkbQSYS h4ZDmCxmIWAfP4nPsOizqSKTGM8C3PMUhe061HtbYlndnp6diZrQdz/8GMu1W5Q84kjp fF9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5svdymI2gvt1okpGw3+2KcMOeeGRLNSv/PifUcd0j3A=; b=cnbEElTQjFSqDsAB/39suyOmPRusKdqqmNrF19ZmDWbDOR0YwJhDVsN0zGZMkqXRVz fuo6IdI7NM9I6Ph9w2eIqFkr1E8IP5zZaI5uJ0727TIhZ2LJI2Yp24LbWaZv0CAop67N khlz/CFzkejtXy26nOu9huWm35j0uV7iT1PIFUoCEhWOADusp97OReqTUnknYO/14l7k XFGijAd/SnjeXftcl8fbmq7Tml/bvhQfsVMlcA4ldau4Lp11RFck5KZXNlM9KDRWdkHv dWiXR0P3B6gTlWsEjUYJKV1ZpPv69vOjv7XgoqTBc1b+xaMf7sOSPa4l6QzCEMnSjGls QNLg== X-Gm-Message-State: AOAM531Xop32JJaULaL7CAaTnBqAWxGefEeBH2xwzcyim9WHDQ3hoM+4 CWu+Yth+qMvkLAoehVo8CNMorpImVATWJw== 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) Return-Path: 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-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> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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;=0D EFI_EVENT HotKeyEvent =3D NULL;=0D =0D -UINTN mBootMenuOptionNumber;=0D -=0D =0D /**=0D This function will create a SHELL BootOption to boot.=0D @@ -188,9 +186,6 @@ CreateFvBootOption ( EFI_GUID mUiFile =3D {=0D 0x462CAA21, 0x7614, 0x4503, { 0x83, 0x6E, 0x8A, 0xB6, 0xF4, 0x66, 0x23, = 0x31 }=0D };=0D -EFI_GUID mBootMenuFile =3D {=0D - 0xEEC25BDC, 0x67F2, 0x4D95, { 0xB1, 0xD5, 0xF8, 0x1B, 0x20, 0x39, 0xD1, = 0x1D }=0D -};=0D =0D =0D /**=0D @@ -353,15 +348,6 @@ RegisterDefaultBootOption ( ShellDataSize =3D 0;=0D RegisterFvBootOption (&gUefiShellFileGuid, INTERNAL_UEFI_SHELL_NA= ME, (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellDataSize);=0D =0D - //=0D - // Boot Menu=0D - //=0D - mBootMenuOptionNumber =3D RegisterFvBootOption (&mBootMenuFile, L"Boot D= evice List", (UINTN) -1, LOAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | = LOAD_OPTION_HIDDEN, NULL, 0);=0D -=0D - if (mBootMenuOptionNumber =3D=3D LoadOptionNumberUnassigned) {=0D - DEBUG ((DEBUG_INFO, "BootMenuOptionNumber (%d) should not be same to L= oadOptionNumberUnassigned(%d).\n", mBootMenuOptionNumber, LoadOptionNumberU= nassigned));=0D - }=0D -=0D //=0D // Boot Manager Menu=0D //=0D @@ -461,15 +447,14 @@ RegisterStaticHotkey ( Status =3D EfiBootManagerGetBootManagerMenu (&BootOption);=0D ASSERT_EFI_ERROR (Status);=0D RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F2.Key, TRU= E);=0D - EfiBootManagerFreeLoadOption (&BootOption);=0D =0D F7.Key.ScanCode =3D SCAN_F7;=0D F7.Key.UnicodeChar =3D CHAR_NULL;=0D F7.KeyState.KeyShiftState =3D EFI_SHIFT_STATE_VALID;=0D F7.KeyState.KeyToggleState =3D 0;=0D mBootMenuBoot =3D !EnterSetup;=0D - RegisterBootOptionHotkey ((UINT16) mBootMenuOptionNumber, &F7.Key, mBoot= MenuBoot);=0D -=0D + RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F7.Key, mBo= otMenuBoot);=0D + EfiBootManagerFreeLoadOption (&BootOption);=0D }=0D =0D =0D --=20 2.31.1