Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Framework / Guid / DataHubRecords / DataHubSubClassMisc.h

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
index 56124059a67df3319c94edc0db97dcd9f00d975e..d7545afc8bbcb3857fd77c0057a5f20bee2adb5f 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
@@ -1,6 +1,6 @@
 /*++\r
  \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -261,6 +261,7 @@ typedef enum {
 \r
 typedef struct {\r
   UINT32  RecordType  :1;\r
+  UINT32  Type        :7;\r
   UINT32  Reserved    :24;\r
 } EFI_MISC_ELEMENT_TYPE;\r
 \r
@@ -417,7 +418,7 @@ typedef enum {
   EfiSlotTypeApg2X = 0x10,\r
   EfiSlotTypeAgp4X = 0x11,\r
   EfiSlotTypePciX = 0x12,\r
-  EfiSlotTypeAgp4x = 0x13,\r
+  EfiSlotTypeAgp8X = 0x13,\r
   EfiSlotTypePC98C20 = 0xA0,\r
   EfiSlotTypePC98C24 = 0xA1,\r
   EfiSlotTypePC98E = 0xA2,\r
@@ -428,7 +429,13 @@ typedef enum {
   EfiSlotTypePciExpressX2 = 0xA7,\r
   EfiSlotTypePciExpressX4 = 0xA8,\r
   EfiSlotTypePciExpressX8 = 0xA9,\r
-  EfiSlotTypePciExpressX16 = 0xAA\r
+  EfiSlotTypePciExpressX16 = 0xAA,\r
+  EfiSlotTypePciExpressGen2    = 0xAB,\r
+  EfiSlotTypePciExpressGen2X1  = 0xAC,\r
+  EfiSlotTypePciExpressGen2X2  = 0xAD,\r
+  EfiSlotTypePciExpressGen2X4  = 0xAE,\r
+  EfiSlotTypePciExpressGen2X8  = 0xAF,\r
+  EfiSlotTypePciExpressGen2X16 = 0xB0\r
 } EFI_MISC_SLOT_TYPE;\r
 \r
 typedef enum {  \r
@@ -595,6 +602,7 @@ typedef struct {
   EFI_INTER_LINK_DATA GroupLink;\r
   UINT16              GroupId;\r
   UINT16              GroupElementId;\r
+  UINT8               ItemType;\r
 } EFI_MISC_GROUP_ITEM_SET_DATA;\r
 \r
 //\r
@@ -711,7 +719,12 @@ typedef struct {
 //\r
 // Misc. Hardware Security - SMBIOS Type 24\r
 //\r
-#define EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA_RECORD_NUMBER 0x00000012\r
+#define EFI_MISC_HARDWARE_SECURITY_RECORD_NUMBER 0x00000012\r
+\r
+//\r
+// Backward Compatibility\r
+//\r
+#define EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA_RECORD_NUMBER  EFI_MISC_HARDWARE_SECURITY_RECORD_NUMBER\r
 \r
 typedef enum {\r
   EfiHardwareSecurityStatusDisabled = 0,\r
@@ -966,6 +979,7 @@ typedef struct {
   EFI_INTER_LINK_DATA   ManagementDeviceLink;\r
   EFI_INTER_LINK_DATA   ManagementDeviceComponentLink;\r
   EFI_INTER_LINK_DATA   ManagementDeviceThresholdLink;\r
+  UINT8                 ComponentType;\r
 } EFI_MISC_MANAGEMENT_DEVICE_COMPONENT_DESCRIPTION;\r
 \r
 //\r
@@ -1013,7 +1027,7 @@ typedef struct {
 } POWER_SUPPLY_CHARACTERISTICS;\r
 \r
 typedef struct {\r
-  UINT8                           PowerUnitGroup;\r
+  UINT16                          PowerUnitGroup;\r
   STRING_REF                      PowerSupplyLocation;\r
   STRING_REF                      PowerSupplyDeviceName;\r
   STRING_REF                      PowerSupplyManufacturer;\r
@@ -1098,18 +1112,62 @@ typedef struct {
 //  Misc. System Event Log  - SMBIOS Type 15\r
 //\r
 #define EFI_MISC_SYSTEM_EVENT_LOG_RECORD_NUMBER 0x00000020\r
+\r
+typedef enum {  \r
+  EfiEventLogTypeReserved1                          = 0,\r
+  EfiEventLogTypeSingleBitEccMemoryError            = 1,\r
+  EfiEventLogTypeMultiBitEccMemoryError             = 2,\r
+  EfiEventLogTypeParityMemoryError                  = 3,\r
+  EfiEventLogTypeBusTimeOut                         = 4,\r
+  EfiEventLogTypeIoChannelCheck                     = 5,\r
+  EfiEventLogTypeSoftwareNmi                        = 6,\r
+  EfiEventLogTypePostMemoryResize                   = 7,\r
+  EfiEventLogTypePostError                          = 8,\r
+  EfiEventLogTypePciParityError                     = 9,\r
+  EfiEventLogTypePciSystemError                     = 0xA,\r
+  EfiEventLogTypeCpuFailure                         = 0xB,\r
+  EfiEventLogTypeEisaFailSafeTimerTimeOut           = 0xC,\r
+  EfiEventLogTypeCorrectableMemoryLogDisabled       = 0xD,\r
+  EfiEventLogTypeLoggingDisabled                    = 0xE,\r
+  EfiEventLogTypeReserved2                          = 0xF,\r
+  EfiEventLogTypeSystemLimitExceeded                = 0x10,\r
+  EfiEventLogTypeAsynchronousHardwareTimerExpired   = 0x11,\r
+  EfiEventLogTypeSystemConfigurationInformation     = 0x12,\r
+  EfiEventLogTypeHardDiskInformation                = 0x13,\r
+  EfiEventLogTypeSystemReconfigured                 = 0x14,\r
+  EfiEventLogTypeUncorrectableCpuComplexError       = 0x15,\r
+  EfiEventLogTypeLogAreaResetCleared                = 0x16,\r
+  EfiEventLogTypeSystemBoot                         = 0x17,\r
+  EfiEventLogTypeEndOfLog                           = 0xFF\r
+} EFI_MISC_LOG_TYPE;\r
+\r
+typedef enum {  \r
+  EfiEventLogDataFormatTypeNone = 0,\r
+  EfiEventLogDataFormatTypeHandle = 1,\r
+  EfiEventLogDataFormatTypeMultipleEvent = 2,\r
+  EfiEventLogDataFormatTypeMultipleEventHandle = 3,\r
+  EfiEventLogDataFormatTypePostResultsBitmap = 4,\r
+  EfiEventLogDataFormatTypeSystemManagement = 5,\r
+  EfiEventLogDataFormatTypeMultipleEventSystemManagement = 6\r
+} EFI_MISC_VARIABLE_DATA_FORMAT_TYPE;\r
+\r
+typedef struct {\r
+  UINT8                 LogType;\r
+  UINT8                 DataFormatType;\r
+} EFI_MISC_EVENT_LOG_TYPE;\r
+\r
 typedef struct {\r
-  //SMBIOS_STRUCTURE_HDR  Header;\r
-  UINT16                LogAreaLength;\r
-  UINT16                LogHeaderStartOffset;\r
-  UINT16                LogDataStartOffset;\r
-  UINT8                 AccessMethod;\r
-  UINT8                 LogStatus;\r
-  UINT32                LogChangeToken;\r
-  UINT32                AccessMethodAddress;\r
-  UINT8                 LogHeaderFormat;\r
-  UINT8                 NumberOfSupportedLogType;\r
-  UINT8                 LengthOfLogDescriptor;\r
+  UINT16                    LogAreaLength;\r
+  UINT16                    LogHeaderStartOffset;\r
+  UINT16                    LogDataStartOffset;\r
+  UINT8                     AccessMethod;\r
+  UINT8                     LogStatus;\r
+  UINT32                    LogChangeToken;\r
+  UINT32                    AccessMethodAddress;\r
+  UINT8                     LogHeaderFormat;\r
+  UINT8                     NumberOfSupportedLogType;\r
+  UINT8                     LengthOfLogDescriptor;\r
+  EFI_PHYSICAL_ADDRESS      EventLogTypeDescriptors; // Pointer to EFI_MISC_EVENT_LOG_TYPE\r
 } EFI_MISC_SYSTEM_EVENT_LOG;\r
 \r
 //\r