//\r
// EFI Event Types (name defined in spec)\r
//\r
-#define EVENT_TIMER 0x80000000\r
-#define EVENT_RUNTIME 0x40000000\r
-#define EVENT_RUNTIME_CONTEXT 0x20000000\r
+#define EVT_TIMER 0x80000000\r
+#define EVT_RUNTIME 0x40000000\r
+\r
+#define EVT_NOTIFY_WAIT 0x00000100\r
+#define EVT_NOTIFY_SIGNAL 0x00000200\r
+#define EVT_SIGNAL_EXIT_BOOT_SERVICES 0x00000201\r
+#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202\r
\r
-#define EVENT_NOTIFY_WAIT 0x00000100\r
-#define EVENT_NOTIFY_SIGNAL 0x00000200\r
+#define EVENT_TIMER EVT_TIMER\r
+#define EVENT_RUNTIME EVT_RUNTIME\r
+#define EVENT_RUNTIME_CONTEXT 0x20000000\r
\r
-#define EVENT_SIGNAL_EXIT_BOOT_SERVICES 0x00000201\r
-#define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202\r
+#define EVENT_NOTIFY_WAIT EVT_NOTIFY_WAIT\r
+#define EVENT_NOTIFY_SIGNAL EVT_NOTIFY_SIGNAL\r
+#define EVENT_SIGNAL_EXIT_BOOT_SERVICES EVT_SIGNAL_EXIT_BOOT_SERVICES\r
+#define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE\r
\r
//\r
// Prior to UEFI 2.0 Tiano extended these enums. This was replaced by\r