PAL_LOGICAL_PROCESSPR_OVERVIEW structure was incorrectly defined. And PAL_MC_ERROR_TY...

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

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index 694ee3361b114f5f34624cbb3292e741ca0ea7ec..c74e18a7fcee321cadac5a5ccaaa50a02c153726 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -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
@@ -857,8 +855,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 +943,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 +963,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 +1175,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 +1239,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 +1307,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 +1315,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