UEFI Specification has a name conflict. Change the Variable definitions to not confli...

[mirror_edk2.git] / MdePkg / Include / Uefi / UefiSpec.h

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 7e05178aec5200cd86cd2d892b9cfdcdd7e570a4..b1fdb56e738ef62363cca75f00195d005b80f61f 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -318,18 +318,27 @@ EFI_STATUS
 \r
 \r
 //\r
-// These types can be ¡°ORed¡± together as needed ¨C for example,\r
-// EVT_TIMER might be ¡°Ored¡± with EVT_NOTIFY_WAIT or\r
+// These types can be ORed together as needed ¨C for example,\r
+// EVT_TIMER might be Ored with EVT_NOTIFY_WAIT or\r
 // EVT_NOTIFY_SIGNAL.\r
 //\r
 #define EVT_TIMER                         0x80000000\r
+#define EFI_EVENT_TIMER                   EVT_TIMER\r
+\r
 #define EVT_RUNTIME                       0x40000000\r
+#define EFI_EVENT_RUNTIME                 EVT_RUNTIME\r
 \r
 #define EVT_NOTIFY_WAIT                   0x00000100\r
+#define EFI_EVENT_NOTIFY_WAIT             EVT_NOTIFY_WAIT\r
+\r
 #define EVT_NOTIFY_SIGNAL                 0x00000200\r
+#define EFI_EVENT_NOTIFY_SIGNAL           EVT_NOTIFY_SIGNAL\r
+\r
 #define EVT_SIGNAL_EXIT_BOOT_SERVICES     0x00000201\r
-#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202\r
+#define EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES         EVT_SIGNAL_EXIT_BOOT_SERVICES\r
 \r
+#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202\r
+#define EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE     EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE\r
 \r
 //\r
 // The event¡¯s NotifyContext pointer points to a runtime memory\r
@@ -885,6 +894,7 @@ typedef enum {
   EfiResetCold,\r
   EfiResetWarm,\r
   EfiResetShutdown,\r
+  EfiResetUpdate\r
 } EFI_RESET_TYPE;\r
 \r
 /**\r
@@ -1528,14 +1538,14 @@ EFI_STATUS
 //\r
 // EFI Runtime Services Table\r
 //\r
-#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249\r
+#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249ULL\r
 #define EFI_SYSTEM_TABLE_REVISION       ((2<<16) | (10))\r
 #define EFI_2_10_SYSTEM_TABLE_REVISION  ((2<<16) | (10))\r
 #define EFI_2_00_SYSTEM_TABLE_REVISION  ((2<<16) | (00))\r
 #define EFI_1_10_SYSTEM_TABLE_REVISION  ((1<<16) | (10))\r
 #define EFI_1_02_SYSTEM_TABLE_REVISION  ((1<<16) | (02))\r
 \r
-#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552\r
+#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552ULL\r
 #define EFI_RUNTIME_SERVICES_REVISION   EFI_2_10_SYSTEM_TABLE_REVISION\r
 \r
 typedef struct {\r
@@ -1581,7 +1591,7 @@ typedef struct {
 } EFI_RUNTIME_SERVICES;\r
 \r
 \r
-#define EFI_BOOT_SERVICES_SIGNATURE   0x56524553544f4f42\r
+#define EFI_BOOT_SERVICES_SIGNATURE   0x56524553544f4f42ULL\r
 #define EFI_BOOT_SERVICES_REVISION    EFI_2_10_SYSTEM_TABLE_REVISION\r
 \r
 typedef struct {\r
@@ -1702,6 +1712,52 @@ struct _EFI_SYSTEM_TABLE {
   EFI_CONFIGURATION_TABLE           *ConfigurationTable;\r
 };\r
 \r
+//\r
+// EFI Load Options Attributes\r
+//\r
+#define LOAD_OPTION_ACTIVE            0x00000001\r
+#define LOAD_OPTION_FORCE_RECONNECT   0x00000002\r
+#define LOAD_OPTION_HIDDEN            0x00000008\r
+#define LOAD_OPTION_CATEGORY          0x00001F00\r
+\r
+#define LOAD_OPTION_CATEGORY_BOOT     0x00000000\r
+#define LOAD_OPTION_CATEGORY_APP      0x00000100\r
+\r
+#define EFI_BOOT_OPTION_SUPPORT_KEY   0x00000001\r
+#define EFI_BOOT_OPTION_SUPPORT_APP   0x00000002\r
+#define EFI_BOOT_OPTION_SUPPORT_COUNT 0x00000300\r
+\r
+typedef union {\r
+  struct {\r
+    UINT32  Revision        : 8;\r
+    UINT32  ShiftPressed    : 1;\r
+    UINT32  ControlPressed  : 1;\r
+    UINT32  AltPressed      : 1;\r
+    UINT32  LogoPressed     : 1;\r
+    UINT32  MenuPressed     : 1;\r
+    UINT32  SysReqPessed    : 1;\r
+    UINT32  Reserved        : 16;\r
+    UINT32  InputKeyCount   : 2;\r
+  }       Options;\r
+  UINT32  PackedValue;\r
+} HOT_KEY_EFI_KEY_DATA;\r
+\r
+typedef struct {\r
+  HOT_KEY_EFI_KEY_DATA  KeyOptions;\r
+  UINT32                BootOptionCrc;\r
+  UINT16                BootOption;\r
+//EFI_INPUT_KEY         Keys[];\r
+} EFI_KEY_OPTION;\r
+\r
+#define EFI_KEY_OPTION_SHIFT     0x00000001\r
+#define EFI_KEY_OPTION_CONTROL   0x00000002\r
+#define EFI_KEY_OPTION_ALT       0x00000004\r
+#define EFI_KEY_OPTION_LOGO      0x00000008\r
+#define EFI_KEY_OPTION_MENU      0x00000010\r
+#define EFI_KEY_OPTION_SYSREQ    0x00000020\r
+#define EFI_KEY_CODE_COUNT       0x00000300\r
+\r
+\r
 //\r
 // EFI File location to boot from on removable media devices\r
 //\r