1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[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 901a464487c53f24efeba0224c51fcc2acf595f6..5c3e6dae048a637bb9d437027b5a9a47b8b5aeec 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 - 2006, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
 All rights reserved. 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
@@ -43,6 +43,11 @@ typedef struct {
   UINT8   LastPciBus;\r
 } EFI_MISC_LAST_PCI_BUS;\r
 \r
+typedef struct {\r
+  UINT8      FunctionNum  :3;\r
+  UINT8      DeviceNum    :5;\r
+} EFI_MISC_DEV_FUNC_NUM;\r
+\r
 //\r
 //////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -225,6 +230,10 @@ typedef enum {
   EfiMiscChassisTypeRackMountChassis = 0x17,\r
   EfiMiscChassisTypeSealedCasePc = 0x18,\r
   EfiMiscChassisMultiSystemChassis = 0x19,\r
+  EfiMiscChassisCompactPCI = 0x1A,\r
+  EfiMiscChassisAdvancedTCA = 0x1B,\r
+  EfiMiscChassisBlade = 0x1C,\r
+  EfiMiscChassisBladeEnclosure = 0x1D\r
 } EFI_MISC_CHASSIS_TYPE;\r
 \r
 typedef struct {\r
@@ -323,6 +332,7 @@ typedef enum {
   EfiPortConnectorTypeHeadPhoneMiniJack = 0x1F,\r
   EfiPortConnectorTypeBNC = 0x20,\r
   EfiPortConnectorType1394 = 0x21,\r
+  EfiPortConnectorTypeSasSata = 0x22,\r
   EfiPortConnectorTypePC98 = 0xA0,\r
   EfiPortConnectorTypePC98Hireso = 0xA1,\r
   EfiPortConnectorTypePCH98 = 0xA2,\r
@@ -364,6 +374,8 @@ typedef enum {
   EfiPortTypeAudioPort = 0x1D,\r
   EfiPortTypeModemPort = 0x1E,\r
   EfiPortTypeNetworkPort = 0x1F,\r
+  EfiPortTypeSata = 0x20,\r
+  EfiPortTypeSas = 0x21,\r
   EfiPortType8251Compatible = 0xA0,\r
   EfiPortType8251FifoCompatible = 0xA1,\r
   EfiPortTypeOther = 0xFF,\r
@@ -412,6 +424,11 @@ typedef enum {
   EfiSlotTypePC98LocalBus = 0xA3,\r
   EfiSlotTypePC98Card = 0xA4,\r
   EfiSlotTypePciExpress = 0xA5,\r
+  EfiSlotTypePciExpressX1 = 0xA6,\r
+  EfiSlotTypePciExpressX2 = 0xA7,\r
+  EfiSlotTypePciExpressX4 = 0xA8,\r
+  EfiSlotTypePciExpressX8 = 0xA9,\r
+  EfiSlotTypePciExpressX16 = 0xAA\r
 } EFI_MISC_SLOT_TYPE;\r
 \r
 typedef enum {  \r
@@ -469,6 +486,9 @@ typedef struct {
   UINT16                        SlotId;\r
   EFI_MISC_SLOT_CHARACTERISTICS SlotCharacteristics;\r
   EFI_DEVICE_PATH_PROTOCOL      SlotDevicePath;\r
+  UINT16                        SegmentGroupNum;\r
+  UINT8                         BusNum;\r
+  EFI_MISC_DEV_FUNC_NUM         DevFuncNum;\r
 } EFI_MISC_SYSTEM_SLOT_DESIGNATION;      \r
 \r
 //\r
@@ -486,6 +506,9 @@ typedef enum {
   EfiOnBoardDeviceTypeEthernet = 5,\r
   EfiOnBoardDeviceTypeTokenRing = 6,\r
   EfiOnBoardDeviceTypeSound = 7,\r
+  EfiOnBoardDeviceTypePataController = 8,\r
+  EfiOnBoardDeviceTypeSataController = 9,\r
+  EfiOnBoardDeviceTypeSasController = 10\r
 } EFI_MISC_ONBOARD_DEVICE_TYPE;\r
 \r
 typedef struct {\r
@@ -1007,6 +1030,48 @@ typedef struct {
 \r
 #define EFI_MISC_SYSTEM_POWER_SUPPLY_RECORD_NUMBER 0x0000001E\r
 \r
+//\r
+//////////////////////////////////////////////////////////////////////////////\r
+//\r
+//Additional Information Record - SMBIOS Type 40\r
+//\r
+typedef struct {                       \r
+  UINT8                   EntryLength; \r
+  UINT8                   ReferencedSmbiosType;\r
+  EFI_INTER_LINK_DATA     ReferencedLink;\r
+  UINT8                   ReferencedOffset;\r
+  STRING_REF              EntryString;\r
+  EFI_PHYSICAL_ADDRESS    ValueAddress;\r
+} EFI_MISC_ADDITIONAL_INFORMATION_ENTRY;                               \r
+                                   \r
+typedef struct {\r
+  UINT8                                  NumberOfAdditionalInformationEntries;\r
+  EFI_PHYSICAL_ADDRESS                   AdditionalInfoEntriesAddr;\r
+} EFI_MISC_ADDITIONAL_INFORMATION;\r
+\r
+#define EFI_MISC_ADDITIONAL_INFORMATION_RECORD_NUMBER 0x00000022\r
+\r
+//\r
+//////////////////////////////////////////////////////////////////////////////\r
+//\r
+//Onboard Devices Extended Infomation Record - SMBIOS Type 41\r
+//\r
+typedef struct {\r
+  UINT8     TypeOfDevice:7;\r
+  UINT8     DeviceStatus:1;\r
+} EFI_MISC_DEVICE_TYPE;\r
+\r
+typedef struct {\r
+  STRING_REF              ReferenceDesignation;\r
+  EFI_MISC_DEVICE_TYPE    DeviceType;\r
+  UINT8                   DeviceTypeInstance;\r
+  UINT16                  SegmentGroupNum;\r
+  UINT8                   BusNum;\r
+  EFI_MISC_DEV_FUNC_NUM   DevFuncNum;\r
+} EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION;\r
+\r
+#define EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION_RECORD_NUMBER 0x00000023\r
+\r
 //\r
 //////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -1113,7 +1178,9 @@ typedef union {
   EFI_MISC_IPMI_INTERFACE_TYPE_DATA                     MiscIpmiInterfaceTypeData;\r
   EFI_MISC_SYSTEM_POWER_SUPPLY                          MiscPowerSupplyInfo;\r
   EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION                  MiscSmbiosStructEncapsulation; \r
-  EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD                  MiscManagementDeviceThreshold; \r
+  EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD                  MiscManagementDeviceThreshold;\r
+  EFI_MISC_ADDITIONAL_INFORMATION                       MiscAdditionalInformation;\r
+  EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION         MiscOnBoardDevicesExtendedInformation;\r
 } EFI_MISC_SUBCLASS_RECORDS;\r
 \r
 //\r