Update EFI_KEY_OPTION.KeyOptions --> EFI_KEY_OPTION.KeyData to follow UEFI spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6975 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2008-12-10 08:23:15 +00:00
parent 1bf793701b
commit 9614285eb5
1 changed files with 4 additions and 4 deletions

View File

@ -104,7 +104,7 @@ RegisterHotkey (
return EFI_INVALID_PARAMETER;
}
KeyOptionSize = sizeof (EFI_KEY_OPTION) + GET_KEY_CODE_COUNT (KeyOption->KeyOptions.PackedValue) * sizeof (EFI_INPUT_KEY);
KeyOptionSize = sizeof (EFI_KEY_OPTION) + GET_KEY_CODE_COUNT (KeyOption->KeyData.PackedValue) * sizeof (EFI_INPUT_KEY);
UpdateBootOption = FALSE;
//
@ -146,8 +146,8 @@ RegisterHotkey (
return EFI_SUCCESS;
}
if (KeyOption->KeyOptions.PackedValue == TempOption->KeyOptions.PackedValue) {
if (GET_KEY_CODE_COUNT (KeyOption->KeyOptions.PackedValue) == 0 ||
if (KeyOption->KeyData.PackedValue == TempOption->KeyData.PackedValue) {
if (GET_KEY_CODE_COUNT (KeyOption->KeyData.PackedValue) == 0 ||
CompareMem (
((UINT8 *) TempOption) + sizeof (EFI_KEY_OPTION),
((UINT8 *) KeyOption) + sizeof (EFI_KEY_OPTION),
@ -559,7 +559,7 @@ HotkeyInsertList (
HotkeyLeft->Signature = BDS_HOTKEY_OPTION_SIGNATURE;
HotkeyLeft->BootOptionNumber = KeyOption->BootOption;
KeyOptions = KeyOption->KeyOptions.PackedValue;
KeyOptions = KeyOption->KeyData.PackedValue;
HotkeyLeft->CodeCount = (UINT8) GET_KEY_CODE_COUNT (KeyOptions);