From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mx.groups.io with SMTP id smtpd.web11.1145.1630179727940424535 for ; Sat, 28 Aug 2021 12:42:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=KP5yBL3q; spf=pass (domain: gmail.com, ip: 209.85.160.176, mailfrom: benjamin.doron00@gmail.com) Received: by mail-qt1-f176.google.com with SMTP id x5so8217814qtq.13 for ; Sat, 28 Aug 2021 12:42:07 -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=FJHBrKEGZ74yZIxjJnRuNEpL1pOF7TyR7KKjw7evM70=; b=KP5yBL3qSAphk3Um8LZrbmvJ58G6y58EfKPKdtTqFOEmmsbgrgqLFxc0Pgef9p/JKJ TE8BlXvJdUCk4a02Yfpb2ra2kbejZ9FAyHSCBWfr3dyp+EUQdBUcFE6qa2Wnugp1ARRe vn2nihufdAfIeHWnSPO4g/o5ztQKKVpXoYANBId21YRoG4w4O7335vu6sr2hWL05if1w 4mSDBvVNS3XF7WLiI0PlMSODDaIFxfN94u5lNBRe8rRLs+HZLJOzm/bg/7EjL+duQPkw 3WltAaSLHAtJMTzl7ud0CeeuQUK98DAyBTlBfkRLzdmD82VcPIztV9Bs73AejzqursK0 2DVQ== 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=FJHBrKEGZ74yZIxjJnRuNEpL1pOF7TyR7KKjw7evM70=; b=qEJgTHo/MUqMpEPeeC8Fspo/jodFGEeVbdp77P10PuwxD9OvMwk4G5v0LLOrlIymnO Vrwyqvvv0lUNWmWfuV6I9KgZHpRMxmPt5m+ChJuC8SxV7EO0dy9vDuyYCTOsalQimaW9 9ymCO3/D3QYhYvRFpymflS85/JCcSv34lzw1ikNUUDwFtm7B2mdaQ/JSZCZqIuBzkTQ3 lXcLZEVi8cvYwMUcU6Etqzwkf4hytljy5jo6OS6DKZM4sE//NDlGSAj+83yMuE06SzPh FBYG3KC/NsOD2ouv22RvapXLHkhNBDNZfhsG/PytYMS919QW+wfkPWvfhMSVleMcXgZv fYAg== X-Gm-Message-State: AOAM5336P/XVawiyaS/TWyXuL0ZzyvRLGNxbrG0pOeS8mTf1/cWu92JQ yUSSId4eHvKbUEvGlLR+oHYxy8IBArw= X-Google-Smtp-Source: ABdhPJxMnOuet9XeYuDGpr2vTKsMiZrk3uT6ZHN7qRhky4upythBv/uflpI+O0MRd/2IWoMztn7KMA== X-Received: by 2002:aed:2029:: with SMTP id 38mr14026039qta.71.1630179726994; Sat, 28 Aug 2021 12:42:06 -0700 (PDT) Return-Path: Received: from benjamind-benjamindomain.. ([2607:f2c0:e98c:24:a8c6:887f:fc2d:64af]) by smtp.gmail.com with ESMTPSA id a22sm5709177qtw.59.2021.08.28.12.42.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Aug 2021 12:42:06 -0700 (PDT) From: "Benjamin Doron" To: devel@edk2.groups.io Cc: Eric Dong , Liming Gao , Nate DeSimone Subject: [edk2-platforms][PATCH v1] BoardModulePkg/BoardBdsHookLib: Fix mSetupOptionNumber check Date: Sat, 28 Aug 2021 15:42:05 -0400 Message-Id: <20210828194205.6083-1-benjamin.doron00@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable If CreateFvBootOption() fails, RegisterFvBootOption() will return LoadOptionNumberUnassigned, which is non-zero. Therefore, correct the check when attempting to register hotkeys, to be able to detect if UiApp is not present. Cc: Eric Dong Cc: Liming Gao Cc: Nate DeSimone Signed-off-by: Benjamin Doron --- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c | = 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index a07abb214913..1fd0de3961cc 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c @@ -440,7 +440,7 @@ RegisterStaticHotkey ( //=0D // [F2]/[F7]=0D //=0D - if (mSetupOptionNumber) {=0D + if (mSetupOptionNumber !=3D LoadOptionNumberUnassigned) {=0D F2.Key.ScanCode =3D SCAN_F2;=0D F2.Key.UnicodeChar =3D CHAR_NULL;=0D F2.KeyState.KeyShiftState =3D EFI_SHIFT_STATE_VALID;=0D --=20 2.31.1