MdePkg: add missing #defines for decoding PCIe 2.1 extended capability structures

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / SmBios.h

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index c9eb8f7ba1107f49011064ec9003c592c12186d7..91e85eeee1d7fc1879d5b6c27e6d29c10c94fede 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -1,7 +1,7 @@
 /** @file\r
   Industry Standard Definitions of SMBIOS Table Specification v2.7.1\r
 \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r
 The full text of the license may be found at\r
@@ -135,7 +135,7 @@ typedef struct {
   UINT8  AcpiIsSupported                   :1;\r
   UINT8  UsbLegacyIsSupported              :1;\r
   UINT8  AgpIsSupported                    :1;\r
-  UINT8  I20BootIsSupported                :1;\r
+  UINT8  I2OBootIsSupported                :1;\r
   UINT8  Ls120BootIsSupported              :1;\r
   UINT8  AtapiZipDriveBootIsSupported      :1;\r
   UINT8  Boot1394IsSupported               :1;\r
@@ -400,10 +400,8 @@ typedef enum {
   ProcessorFamilyPentiumIII             = 0x11, \r
   ProcessorFamilyM1                     = 0x12,\r
   ProcessorFamilyM2                     = 0x13,\r
-  ProcessorFamilyM1Reserved2            = 0x14,\r
-  ProcessorFamilyM1Reserved3            = 0x15,\r
-  ProcessorFamilyM1Reserved4            = 0x16,\r
-  ProcessorFamilyM1Reserved5            = 0x17,\r
+  ProcessorFamilyIntelCeleronM          = 0x14,\r
+  ProcessorFamilyIntelPentium4Ht        = 0x15,\r
   ProcessorFamilyAmdDuron               = 0x18,\r
   ProcessorFamilyK5                     = 0x19, \r
   ProcessorFamilyK6                     = 0x1A,\r
@@ -567,6 +565,22 @@ typedef enum {
   ProcessorFamilyReserved1              = 0xFF\r
 } PROCESSOR_FAMILY_DATA;\r
 \r
+///\r
+/// Processor Information2 - Processor Family2.\r
+///\r
+typedef enum {\r
+  ProcessorFamilySH3                   = 0x0104,\r
+  ProcessorFamilySH4                   = 0x0105,\r
+  ProcessorFamilyARM                   = 0x0118,\r
+  ProcessorFamilyStrongARM             = 0x0119,\r
+  ProcessorFamily6x86                  = 0x012C,\r
+  ProcessorFamilyMediaGX               = 0x012D,\r
+  ProcessorFamilyMII                   = 0x012E,\r
+  ProcessorFamilyWinChip               = 0x0140,\r
+  ProcessorFamilyDSP                   = 0x015E,\r
+  ProcessorFamilyVideoProcessor        = 0x01F4\r
+} PROCESSOR_FAMILY2_DATA;\r
+\r
 ///\r
 /// Processor Information - Voltage. \r
 ///\r
@@ -857,8 +871,8 @@ typedef struct {
   UINT16  NonBurst      :1;\r
   UINT16  Burst         :1;\r
   UINT16  PipelineBurst :1;\r
-  UINT16  Asynchronous  :1;\r
   UINT16  Synchronous   :1;\r
+  UINT16  Asynchronous  :1;\r
   UINT16  Reserved      :9;\r
 } CACHE_SRAM_TYPE_DATA;\r
 \r
@@ -945,7 +959,7 @@ typedef enum {
   PortConnectorTypeRJ45                   = 0x0B,\r
   PortConnectorType50PinMiniScsi          = 0x0C,\r
   PortConnectorTypeMiniDin                = 0x0D,\r
-  PortConnectorTypeMicriDin               = 0x0E,\r
+  PortConnectorTypeMicroDin               = 0x0E,\r
   PortConnectorTypePS2                    = 0x0F,\r
   PortConnectorTypeInfrared               = 0x10,\r
   PortConnectorTypeHpHil                  = 0x11,\r
@@ -965,6 +979,7 @@ typedef enum {
   PortConnectorTypeHeadPhoneMiniJack      = 0x1F,\r
   PortConnectorTypeBNC                    = 0x20,\r
   PortConnectorType1394                   = 0x21,\r
+  PortConnectorTypeSasSata                = 0x22,\r
   PortConnectorTypePC98                   = 0xA0,\r
   PortConnectorTypePC98Hireso             = 0xA1,\r
   PortConnectorTypePCH98                  = 0xA2,\r
@@ -1176,7 +1191,10 @@ typedef enum {
   OnBoardDeviceTypeScsiController = 0x04,\r
   OnBoardDeviceTypeEthernet       = 0x05,\r
   OnBoardDeviceTypeTokenRing      = 0x06,\r
-  OnBoardDeviceTypeSound          = 0x07\r
+  OnBoardDeviceTypeSound          = 0x07,\r
+  OnBoardDeviceTypePATAController = 0x08,\r
+  OnBoardDeviceTypeSATAController = 0x09,\r
+  OnBoardDeviceTypeSASController  = 0x0A\r
 } MISC_ONBOARD_DEVICE_TYPE;\r
 \r
 ///\r
@@ -1237,6 +1255,27 @@ typedef struct {
   SMBIOS_TABLE_STRING   CurrentLanguages;\r
 } SMBIOS_TABLE_TYPE13;\r
 \r
+///\r
+/// Group Item Entry\r
+///\r
+typedef struct {\r
+  UINT8                 ItemType;\r
+  UINT16                ItemHandle;\r
+} GROUP_STRUCT;\r
+\r
+///\r
+/// Group Associations (Type 14).\r
+///\r
+/// The Group Associations structure is provided for OEMs who want to specify \r
+/// the arrangement or hierarchy of certain components (including other Group Associations) \r
+/// within the system. \r
+///\r
+typedef struct {\r
+  SMBIOS_STRUCTURE      Hdr;\r
+  SMBIOS_TABLE_STRING   GroupName;\r
+  GROUP_STRUCT          Group[1];\r
+} SMBIOS_TABLE_TYPE14;\r
+\r
 ///\r
 /// System Event Log - Event Log Types.\r
 /// \r
@@ -1284,14 +1323,6 @@ typedef enum {
   EventLogVariableOEMAssigned                 = 0x80\r
 } EVENT_LOG_VARIABLE_DATA;\r
 \r
-///\r
-/// Group Item Entry\r
-///\r
-typedef struct {\r
-  UINT8                 ItemType;\r
-  UINT16                ItemHandle;\r
-} GROUP_STRUCT;\r
-\r
 ///\r
 /// Event Log Type Descriptors\r
 ///\r
@@ -1300,19 +1331,6 @@ typedef struct {
   UINT8                 DataFormatType;\r
 } EVENT_LOG_TYPE;\r
 \r
-///\r
-/// Group Associations (Type 14).\r
-///\r
-/// The Group Associations structure is provided for OEMs who want to specify \r
-/// the arrangement or hierarchy of certain components (including other Group Associations) \r
-/// within the system. \r
-///\r
-typedef struct {\r
-  SMBIOS_STRUCTURE      Hdr;\r
-  SMBIOS_TABLE_STRING   GroupName;\r
-  GROUP_STRUCT          Group[1];\r
-} SMBIOS_TABLE_TYPE14;\r
-\r
 ///\r
 /// System Event Log (Type 15).\r
 ///\r
@@ -2245,6 +2263,7 @@ typedef union {
   SMBIOS_TABLE_TYPE39   *Type39;\r
   SMBIOS_TABLE_TYPE40   *Type40;\r
   SMBIOS_TABLE_TYPE41   *Type41;\r
+  SMBIOS_TABLE_TYPE42   *Type42;\r
   SMBIOS_TABLE_TYPE126  *Type126;\r
   SMBIOS_TABLE_TYPE127  *Type127;\r
   UINT8                 *Raw;\r