From 95cba3ee152593d9209c6d23a8518105ce82d7bf Mon Sep 17 00:00:00 2001 From: AJFISH Date: Tue, 31 Jul 2007 15:52:44 +0000 Subject: [PATCH] Added UEFI Boot Manager definitions to UEFISpec.h and removed from BDS git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3515 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Include/Uefi/UefiSpec.h | 38 +++++++++++++++++++ Nt32Pkg/Include/Library/EdkGenericBdsLib.h | 2 - .../Generic/BootMaint/BootMaint.h | 11 ------ 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index 5de9887183..d2bf0d5c09 100644 --- a/MdePkg/Include/Uefi/UefiSpec.h +++ b/MdePkg/Include/Uefi/UefiSpec.h @@ -1712,6 +1712,44 @@ struct _EFI_SYSTEM_TABLE { EFI_CONFIGURATION_TABLE *ConfigurationTable; }; +// +// EFI Load Options Attributes +// +#define LOAD_OPTION_ACTIVE 0x00000001 +#define LOAD_OPTION_FORCE_RECONNECT 0x00000002 +#define LOAD_OPTION_GRAPHICS 0x00000004 +#define LOAD_OPTION_HIDDEN 0x00000008 +#define LOAD_OPTION_CATEGORY 0x00001F00 + +#define LOAD_OPTION_CATEGORY_BOOT 0x00000000 +#define LOAD_OPTION_CATEGORY_APP 0x00000100 + +#define EFI_BOOT_OPTION_SUPPORT_KEY 0x00000001 +#define EFI_BOOT_OPTION_SUPPORT_APP 0x00000002 +#define EFI_BOOT_OPTION_SUPPORT_COUNT 0x00000300 + +typedef union { + struct { + UINT32 Revision : 8; + UINT32 ShiftPressed : 1; + UINT32 ControlPressed : 1; + UINT32 AltPressed : 1; + UINT32 LogoPressed : 1; + UINT32 MenuPressed : 1; + UINT32 SysReqPessed : 1; + UINT32 Reserved : 16; + UINT32 InputKeyCount : 2; + } Options; + UINT32 PackedValue; +} EFI_KEY_DATA; + +typedef struct { + EFI_KEY_DATA KeyData; + UINT32 BootOptionCrc; + UINT16 BootOption; + // EFI_INPUT_KEY Keys[]; +} EFI_KEY_OPTION; + // // EFI File location to boot from on removable media devices // diff --git a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h index 7d64675b63..360407b9f4 100644 --- a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h +++ b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h @@ -49,8 +49,6 @@ extern EFI_HANDLE mBdsImageHandle; // // Load Option Attributes defined in EFI Specification // -#define LOAD_OPTION_ACTIVE 0x00000001 -#define LOAD_OPTION_FORCE_RECONNECT 0x00000002 #define IS_LOAD_OPTION_TYPE(_c, _Mask) (BOOLEAN) (((_c) & (_Mask)) != 0) // diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h index 5b21fabbc0..c366a66577 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h @@ -81,17 +81,6 @@ Revision History #define MAX_CHAR 480 #define MAX_CHAR_SIZE (MAX_CHAR * 2) -// -// Check to see if current build support option active feature of -// some driver option -// -#define LOAD_OPTION_ACTIVE 0x00000001 - -// -// Check to see if current build support force reconnect feature of -// some driver option -// -#define LOAD_OPTION_FORCE_RECONNECT 0x00000002 // // Below are the form ids for display, form id is used as callback key value, -- 2.39.2