From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.81]) by mx.groups.io with SMTP id smtpd.web10.2518.1654140149333776283 for ; Wed, 01 Jun 2022 20:22:30 -0700 Authentication-Results: mx.groups.io; dkim=fail, err=mail: missing word in phrase: charset not supported: "iso-2022-jp"; spf=pass (domain: ami.com, ip: 40.107.220.81, mailfrom: jameswang@ami.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e8h205JUazEr9n+NQl0NFNGmcndilaXmT3DVO+lvbkb9YWtJIPjKQ6rjCKy7rJazQs+wTuC5xthABHR7Ory4a7kEUYq6K056u1V75uOsxWltFSrjMf+9Rc9/bTcM+Z/YCRUwYZdKNFE9fv43LOCiDK0yOVbLHJdls7ze2dweBqKPidHIq0etukPEW9w5up1MlKCzaqdqVjJ1UXG1yh7o6kq0JeFQ6OBJRE/Svnu3xLQz5acsM/6clddXFh64I8DbB3/d4SBZrd10OHrmocqfvsi3blwMl/l/NxmvPba0KQG9V3mUA1NvlKfjZf+POEnJmLBKaYwHA9YprNEu/BZ5Kg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uM6dzbc+RedK9WkuG4lgQEJDLW4JDhkuHaJs8gU4waM=; b=lfmt2mkGJlH7kN6MSfE6Yz38RGFv+zzQqZyODxqMNrVfyEL3L2SJceqFBs1FQPd+lXKFrxJ0/Zr+DxbdviYqqn7l9vTZBJ/VWtEiNzqziX6dI2Gyn0KN6VIBOTrLNKxUbBJvxGy5GPdF5ZHEHDDSD8VxXG/Q8MhUqG3PiKf0z4zCHoSpyjCW4AFl37VAeKGcVKiR9LQzyopiIAzV1RLJZvxeKSySaT+0X/HoS+dsS9TChmtT4S8dHED0MsRx8QaPUJh4b5ZOukq7uNADJAmN7Ad6Z20oVXSkTDn9QLsA5121m8dZJbH/vnaS7Gt/+x5OwMmjhGg1N7EWxZ8sOM9gGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ami.com; dmarc=pass action=none header.from=ami.com; dkim=pass header.d=ami.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ami.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uM6dzbc+RedK9WkuG4lgQEJDLW4JDhkuHaJs8gU4waM=; b=N0IXxB1c4oAYuFQ9HZxeVgtPt2yiUQnDsU0SvyfcgBBWgHSA2UYSh4K0H8j9xUWC6lQnQRt+TH+//7oy6VFwu0KscMelcH0yqelUGashMg4NxsPIKoCXaHfYR6su746enyrsmnlPf6BYVA8Vxun6SVah6sSgnuecl9nKLQ2IPRA= Received: from PH0PR10MB5756.namprd10.prod.outlook.com (2603:10b6:510:146::19) by BYAPR10MB3655.namprd10.prod.outlook.com (2603:10b6:a03:127::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 03:22:25 +0000 Received: from PH0PR10MB5756.namprd10.prod.outlook.com ([fe80::d6c:2f6b:5f77:d096]) by PH0PR10MB5756.namprd10.prod.outlook.com ([fe80::d6c:2f6b:5f77:d096%6]) with mapi id 15.20.5293.018; Thu, 2 Jun 2022 03:22:25 +0000 From: =?iso-2022-jp?B?SmFtZXNXYW5nIFsbJEIyJjJITEAbKEJd?= To: "devel@edk2.groups.io" CC: =?iso-2022-jp?B?SmFtZXNXYW5nIFsbJEIyJjJITEAbKEJd?= Subject: [PATCH] fix: F7 key can register Boot0000 if error happens getting mBootMenuOptionNumber Thread-Topic: [PATCH] fix: F7 key can register Boot0000 if error happens getting mBootMenuOptionNumber Thread-Index: AQHYdi/6o53UzojrNkWX3NZ27BcHCw== Date: Thu, 2 Jun 2022 03:22:25 +0000 Message-ID: <20220602032215.27900-1-jameswang@ami.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ami.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 310c8e44-1563-427e-9df5-08da44471d7e x-ms-traffictypediagnostic: BYAPR10MB3655:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: EOirj6kTxc710ZHsg3ZplNE+48geffhCI1imkndT7VzrwYMLmjv+44+e5GhwqAR2T3iz76S6RZPBbGYGeI7ZGHRoJeDpv5BTWocrizroJ08uAN/wSOayF69wKmSCem/X6pO3zeoldV+fk71L61DhiQ8wkYuY1QEPgAL6J6t71jwWNE5bFNEl+CH4rL6jLaJvrXOoB/SD8UM061jfuLcC7S2CCHs4lP9aJH5zgD9+TcQD74m3NIOcioDagUspKbTcxYZwdN/u6GtlHvcdmiAcetjqvdYy4q8QN+ZrnixE/4zpnvu4BuXMMkJPLQQ91IpldB6i3+7Z6XyGPhMyFqjfnlGOwt/ZYjcPj2j+u53/FPIJFnOXb/t/cDhDXzEpr8yrDOHWGHLIRJNqUNyQLnKnh1KYExqSziLO2K8BGWUP1/G/cfqaMMtXpiYeYEt1jEwcZdX/K58BK2uPPpr8f1yLMDL3YjYM9alHc/VP6US360B6Hs5vtASvqllyUqn57Mk2G74yKVojKFfZnJTX4aYoIBRnEYTE0speN5qXDXmFPKSKImX/R16K7381C7575DFD4ZXINT1NFk5s8Wv+17zEQu0jGA6JUHkKyuQQIyK+z/yPrYaaEqY+TvhtCdbnpreIXnC3PYGMxkhsAcOuUvR29rv7lv9BoHhVMKRULXE9N9jI3HV6NQnVqGvVaABhRFx7XUk8w7Pgw9YPAamVfmewCF8xFj1auB4nkYKYJrTTPm605AC22Vdqncfm6axavJ+OD17dMbS5hTCcDXphLdpSeQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5756.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(8936002)(5660300002)(122000001)(19627235002)(316002)(8676002)(2906002)(4326008)(66556008)(66946007)(91956017)(66476007)(64756008)(66446008)(86362001)(38070700005)(38100700002)(76116006)(6512007)(1076003)(6506007)(83380400001)(36756003)(85182001)(6916009)(26005)(186003)(2616005)(40140700001)(71200400001)(508600001)(6486002)(145543001)(145603002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?TGpySjd3K2NtNFBla1RrWFUrb0VYcDNkb2pyb1Z3SG5KQmJMSjJIZllw?= =?iso-2022-jp?B?b1dhNEhLWXd2R3VxVUJKWXhwYXNyZ3ljSW01QXpHZDdFL0dScXhsZ09u?= =?iso-2022-jp?B?dHExVVVzQ0ttU3g0eSswazAyanI1SU91SUZzUFBxakozZVY3UkgzalVK?= =?iso-2022-jp?B?R2EyR2x3My9iZWs5ZUtyK0ZlRkt4TVYxZjF5clY4NDlFTGprK1Yrdmox?= =?iso-2022-jp?B?ZmUwalZnNWh1VU80cktUSDlreXg1WUJXMSs4S2E0a2RXU09nKzJ5VUJ1?= =?iso-2022-jp?B?OW1BUnVSRnZRSys3Tlh0ODByK3JyelFJTEcvSjVIeUNoRm9Rek9CbjIx?= =?iso-2022-jp?B?MXQrd0dHVkRtZFpNMFFQWnFzRWZzK05aREg3cVBYVW1DcjkwT2hESzhD?= =?iso-2022-jp?B?YlZSOUcxeTBqN2dseFk0S1dGYUhON0RoVzhTM20xRHJ0RUhXNFA4TXRo?= =?iso-2022-jp?B?alQxREVyL0FyRGt1MklOWjRUMXdhWEcvNzVJbDBoczR6Tms1RkdHU3h4?= =?iso-2022-jp?B?VEJZSCtUUU53OUd2RWNDcjRPWi9mYzgzMDc4YXV3dU9DYnRpNU5CUmhC?= =?iso-2022-jp?B?d3Q3aWtXTjFDS3o0SVRmREJaV0syQkd3Rk91UmhBOHVTeWI5Rk1JL0Ix?= =?iso-2022-jp?B?TmJlSjVxbWEybVRTV0czREJoem9FZ0RxaC9saXhhYk5KQ21mYmVDN3dI?= =?iso-2022-jp?B?QnBhZGpQS2xQZGxsTCtxRktKRHY2WCtpWUlUMHB1R3c2R2Q0dks0eFpI?= =?iso-2022-jp?B?SlUwaXNubXJGYmVjNTFLYk9ubWc2NjBHcytUQU1kUCtJYy9DbE1hbC9a?= =?iso-2022-jp?B?V2NoWE95bFF5dzFXK3VTWnVGK2NXSjNVeFJPY3NiZlVKNWpkc1B6elJl?= =?iso-2022-jp?B?dHByeUdxdXd0a0hpK3MvSWZYWkJybEV0blA3c0VvbVIvemFtaGM2MTRB?= =?iso-2022-jp?B?RGV4YU9sc1RFRTlEc0VOaDNDejNaekhEY1JoYjArb3FGNVowR005UmJH?= =?iso-2022-jp?B?cC9iZEIySEdUOUZFOW9sREpoRCthek9yWWZXdFZYRFRQREF3UE9UTTF5?= =?iso-2022-jp?B?NWoySCt6aCtIUS9rOXFsUlU2L3h5Nm4rZ0hoMVk5dzdia0p3RE1nTmFu?= =?iso-2022-jp?B?Vk90cnFPeno0T2NleEFreUZDbDEzQTQ2bjNzTXNObHZleWQ1ZWw1aVVy?= =?iso-2022-jp?B?bEFHMitXK0w1dTBCZ1FaOWc5MW9pNm42QjNyVmtremdnZHNSUit5cjI3?= =?iso-2022-jp?B?dTNCY0hMWWUrbEFDdlh3OG9Bd2hZVWVHT1BRUm9TV2VVMy8xQ1NoWDhn?= =?iso-2022-jp?B?WDBsRlBZQlhTTEUvTVNIMEs3WnVBWWx5dzVVVUNhU24xNUV4ZkV5UnlR?= =?iso-2022-jp?B?UXlDZ29ORkpJZVZTQ1F3eFkwbzJjSDFmTFpuekt3cWpzVTUxQzQzSlI1?= =?iso-2022-jp?B?UkYxS3Q3L25YeVhkMFkrVWFiTGdEMHl2R2F5TkE1cHh1clhtQjhVRFh2?= =?iso-2022-jp?B?c3dsaytkWXY5eXhaTTkwYUxPbmZKTmFZZG8zTUVCL2YzWlJtbkVCWFBh?= =?iso-2022-jp?B?RHFMcUo5bU9WbHJwT3REVzFQbTl2YzZ5UXFXdytRRnFSNWZSTSt5bXF0?= =?iso-2022-jp?B?eEZoUDl4aHFYZmU4U0VIVTFRRk01RGw5YmZBMVV3Z0pKQ3JwdmMxRnoz?= =?iso-2022-jp?B?SlhiUmI3alowWDdCZU9MOFJ1MFlPZ0xDNEI3UDIrQnpXMjZSZjR3RTJx?= =?iso-2022-jp?B?SmtBRDI2SmNGa3JaWE8va0NzUVNUTHhGbjVNbHplQXdRL1l4cGpDWVdD?= =?iso-2022-jp?B?YzVrNVF0VWF2UUYyUGlhMFZuZWgwaFVSL2h4M1VGVUVNWFlZMHhQWEti?= =?iso-2022-jp?B?b0hxNkRwQzc0UWhjbmRZL1IwSTZ3ay8vRWRFUE9zcHFSaWFkbm1USDBV?= =?iso-2022-jp?B?c1BTUUZrMHhwWjBnL2wwYnhudEZ1anNwSWpmUnZFQ2NnRTc4TW9EeFVt?= =?iso-2022-jp?B?WHJDVml0NW5YZTU1UzhoVTRjVVhpUTMrT0pRRkY5dnZqZjg5WnNDUlVn?= =?iso-2022-jp?B?WEhVamdWdE9ZeU81ajJrVG9NVDl6WUlQR3hpTis5em8wRnJkWlBpUGZp?= =?iso-2022-jp?B?WXdRYmF3bUNZRVg3RUxUNmh0cEZwZEJJeUh1UTl6N01lS3VBaUxkQXFh?= =?iso-2022-jp?B?V2R5cGtSUjVIZ1NUVkFUWU9Pb2M1cFYwQ2dkQWIwRkF1RHNFUW9DYnlC?= =?iso-2022-jp?B?SzVnQjJuQ1c3QWpjRjloT1hUaVBJVDVnZFVTUFZpVUw0cXVjcE5EWHZM?= =?iso-2022-jp?B?bVBWL3Z0VHB1ZW1YVUV6ZENLZTkyM1VGcHRDWnpWVnphUlNGNjcybTRR?= =?iso-2022-jp?B?bndhOE9yRFlqNUZuMWtJVW00VHRzQnZlTmU5Vmk0dWxaL2l6RTZQa0Rp?= =?iso-2022-jp?B?S2pyV3E5eldiWEJZYWh1cVpTbkZYTDNhRDVmRE1NOWlteFJpMnMwOXdP?= =?iso-2022-jp?B?dW10QzhrT1lneGhTbkUvbWJnZE5lTTZqc1UxZz09?= MIME-Version: 1.0 X-OriginatorOrg: ami.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5756.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 310c8e44-1563-427e-9df5-08da44471d7e X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jun 2022 03:22:25.4394 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 27e97857-e15f-486c-b58e-86c2b3040f93 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: J+n+KgrJvGNy664g7o1D5GeDQ+qR3rS0cs3Z0maUyeC5dkhVaOMRwIPmSWYn+VrcsGUiVK7Ki0Pzj929d7mdJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3655 Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable From: JamesWang --- .../Library/BoardBdsHookLib/BoardBootOption.c | 18 ++++++++++++--= ---- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index 87138bdd..5456acfb 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c @@ -472,12 +472,18 @@ RegisterStaticHotkey ( RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F2.Key, TRU= E); 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) mBootMenuOptionNumber, &F7.Key, mBoot= MenuBoot); + // + // Register F7 only when the mBootMenuOptionNumber is valid + // + if (mBootMenuOptionNumber !=3D LoadOptionNumberUnassigned) + { + 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, mBo= otMenuBoot); + } } -- 2.13.2.windows.1 -The information contained in this message may be confidential and propriet= ary to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephone= at 770-246-8600, and then delete or destroy all copies of the transmission= .