X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FInclude%2FUefi%2FUefiSpec.h;h=c2f52d2769c33c2d22c2e5f4328356136d4dbca9;hp=7f87a1ccc73863b366b7c7a9b79a32d7295af97d;hb=4bb89f14bd8d55989bdded7890a1a17613829396;hpb=45ad5569f4d617b34e611bd423253c2eed3a4c23

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 7f87a1ccc7..c2f52d2769 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -318,18 +318,27 @@ EFI_STATUS
 
 
 //
-// These types can be ¡°ORed¡± together as needed ¨C for example,
-// EVT_TIMER might be ¡°Ored¡± with EVT_NOTIFY_WAIT or
+// These types can be ORed together as needed ¨C for example,
+// EVT_TIMER might be Ored with EVT_NOTIFY_WAIT or
 // EVT_NOTIFY_SIGNAL.
 //
 #define EVT_TIMER                         0x80000000
+#define EFI_EVENT_TIMER                   EVT_TIMER
+
 #define EVT_RUNTIME                       0x40000000
+#define EFI_EVENT_RUNTIME                 EVT_RUNTIME
 
 #define EVT_NOTIFY_WAIT                   0x00000100
+#define EFI_EVENT_NOTIFY_WAIT             EVT_NOTIFY_WAIT
+
 #define EVT_NOTIFY_SIGNAL                 0x00000200
+#define EFI_EVENT_NOTIFY_SIGNAL           EVT_NOTIFY_SIGNAL
+
 #define EVT_SIGNAL_EXIT_BOOT_SERVICES     0x00000201
-#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202
+#define EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES         EVT_SIGNAL_EXIT_BOOT_SERVICES
 
+#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202
+#define EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE     EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE
 
 //
 // The event¡¯s NotifyContext pointer points to a runtime memory
@@ -885,6 +894,7 @@ typedef enum {
   EfiResetCold,
   EfiResetWarm,
   EfiResetShutdown,
+  EfiResetUpdate
 } EFI_RESET_TYPE;
 
 /**
@@ -1461,7 +1471,7 @@ typedef struct {
 typedef
 EFI_STATUS
 (EFIAPI *EFI_UPDATE_CAPSULE) (
-  IN UEFI_CAPSULE_HEADER    **CapsuleHeaderArray,
+  IN EFI_CAPSULE_HEADER     **CapsuleHeaderArray,
   IN UINTN                  CapsuleCount,
   IN EFI_PHYSICAL_ADDRESS   ScatterGatherList   OPTIONAL
   );
@@ -1487,7 +1497,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_QUERY_CAPSULE_CAPABILITIES) (
-  IN  UEFI_CAPSULE_HEADER    **CapsuleHeaderArray,
+  IN  EFI_CAPSULE_HEADER     **CapsuleHeaderArray,
   IN  UINTN                  CapsuleCount,
   OUT UINT64                 *MaximumCapsuleSize,
   OUT EFI_RESET_TYPE         *ResetType
@@ -1702,6 +1712,52 @@ 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_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      KeyOptions;
+  UINT32            BootOptionCrc;
+  UINT16            BootOption;
+//EFI_INPUT_KEY  Keys[];
+} EFI_KEY_OPTION;
+
+#define EFI_KEY_OPTION_SHIFT     0x00000001
+#define EFI_KEY_OPTION_CONTROL   0x00000002
+#define EFI_KEY_OPTION_ALT       0x00000004
+#define EFI_KEY_OPTION_LOGO      0x00000008
+#define EFI_KEY_OPTION_MENU      0x00000010
+#define EFI_KEY_OPTION_SYSREQ    0x00000020
+#define EFI_KEY_CODE_COUNT       0x00000300
+
+
 //
 // EFI File location to boot from on removable media devices
 //