Update the EFI_CAPSULE_HEADER definition.

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

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 4eef223db0d1e809b98a9b567d050b823e3b2076..7f87a1ccc73863b366b7c7a9b79a32d7295af97d 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -14,8 +14,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  Module Name:    UefiSpec.h\r
-\r
 **/\r
 \r
 #ifndef __UEFI_SPEC_H__\r
@@ -27,28 +25,6 @@
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 \r
-//\r
-// Networking Definitions\r
-//\r
-typedef struct {\r
-  UINT8 Addr[4];\r
-} EFI_IPv4_ADDRESS;\r
-\r
-typedef struct {\r
-  UINT8 Addr[16];\r
-} EFI_IPv6_ADDRESS;\r
-\r
-typedef struct {\r
-  UINT8 Addr[32];\r
-} EFI_MAC_ADDRESS;\r
-\r
-typedef union {\r
-  UINT32            Addr[4];\r
-  EFI_IPv4_ADDRESS  v4;\r
-  EFI_IPv6_ADDRESS  v6;\r
-} EFI_IP_ADDRESS;\r
-\r
-\r
 //\r
 // Enumeration of memory allocation.\r
 // \r
@@ -59,6 +35,16 @@ typedef enum {
   MaxAllocateType\r
 } EFI_ALLOCATE_TYPE;\r
 \r
+//\r
+// Bit definitions for EFI_TIME.Daylight\r
+//\r
+#define EFI_TIME_ADJUST_DAYLIGHT  0x01\r
+#define EFI_TIME_IN_DAYLIGHT      0x02\r
+\r
+//\r
+// Value definition for EFI_TIME.TimeZone\r
+//\r
+#define EFI_UNSPECIFIED_TIMEZONE  0x07FF\r
 \r
 //\r
 // possible caching types for the memory range\r
@@ -1438,14 +1424,14 @@ typedef struct {
     EFI_PHYSICAL_ADDRESS  DataBlock;\r
     EFI_PHYSICAL_ADDRESS  ContinuationPointer;\r
   } Union;\r
-} UEFI_CAPSULE_BLOCK_DESCRIPTOR;\r
+} EFI_CAPSULE_BLOCK_DESCRIPTOR;\r
 \r
 typedef struct {\r
   EFI_GUID          CapsuleGuid;\r
   UINT32            HeaderSize;\r
   UINT32            Flags;\r
   UINT32            CapsuleImageSize;\r
-} UEFI_CAPSULE_HEADER;\r
+} EFI_CAPSULE_HEADER;\r
 \r
 #define CAPSULE_FLAGS_PERSIST_ACROSS_RESET          0x00010000\r
 #define CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE         0x00020000\r
@@ -1550,7 +1536,7 @@ EFI_STATUS
 #define EFI_1_02_SYSTEM_TABLE_REVISION  ((1<<16) | (02))\r
 \r
 #define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552\r
-#define EFI_RUNTIME_SERVICES_REVISION   EFI_2_00_SYSTEM_TABLE_REVISION\r
+#define EFI_RUNTIME_SERVICES_REVISION   EFI_2_10_SYSTEM_TABLE_REVISION\r
 \r
 typedef struct {\r
   EFI_TABLE_HEADER Hdr;\r
@@ -1596,7 +1582,7 @@ typedef struct {
 \r
 \r
 #define EFI_BOOT_SERVICES_SIGNATURE   0x56524553544f4f42\r
-#define EFI_BOOT_SERVICES_REVISION    ((2<<16) | (00))\r
+#define EFI_BOOT_SERVICES_REVISION    EFI_2_10_SYSTEM_TABLE_REVISION\r
 \r
 typedef struct {\r
   EFI_TABLE_HEADER  Hdr;\r
@@ -1736,7 +1722,6 @@ struct _EFI_SYSTEM_TABLE {
   #error Unknown Processor Type\r
 #endif\r
 \r
-#include <Uefi/UefiDevicePath.h>\r
 #include <Uefi/UefiPxe.h>\r
 #include <Uefi/UefiGpt.h>\r
 #include <Uefi/UefiInternalFormRepresentation.h>\r