Verified some definitions of DataHubRecord.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8666 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
index 282237a780f5e7cdde11a7c6d60e6d015024446a..951eb6e94f8e35243d97d989b020a996ddfeec25 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
@@ -360,106 +360,124 @@ typedef enum {
 /// This data record is 4 bytes in length. \r
 ///\r
 typedef enum {\r
-  EfiProcessorFamilyOther               = 1,\r
-  EfiProcessorFamilyUnknown             = 2,\r
-  EfiProcessorFamily8086                = 3,\r
-  EfiProcessorFamily80286               = 4,\r
-  EfiProcessorFamilyIntel386            = 5,\r
-  EfiProcessorFamilyIntel486            = 6,\r
-  EfiProcessorFamily8087                = 7,\r
-  EfiProcessorFamily80287               = 8,\r
-  EfiProcessorFamily80387               = 9,\r
-  EfiProcessorFamily80487               = 0x0A,\r
-  EfiProcessorFamilyPentium             = 0x0B,\r
-  EfiProcessorFamilyPentiumPro          = 0x0C,\r
-  EfiProcessorFamilyPentiumII           = 0x0D,\r
-  EfiProcessorFamilyPentiumMMX          = 0x0E,\r
-  EfiProcessorFamilyCeleron             = 0x0F,\r
-  EfiProcessorFamilyPentiumIIXeon       = 0x10,\r
-  EfiProcessorFamilyPentiumIII          = 0x11,\r
-  EfiProcessorFamilyM1                  = 0x12,\r
-  EfiProcessorFamilyM1Reserved1         = 0x13,\r
-  EfiProcessorFamilyM1Reserved2         = 0x14,\r
-  EfiProcessorFamilyM1Reserved3         = 0x15,\r
-  EfiProcessorFamilyM1Reserved4         = 0x16,\r
-  EfiProcessorFamilyM1Reserved5         = 0x17,\r
-  EfiProcessorFamilyM1Reserved6         = 0x18,\r
-  EfiProcessorFamilyK5                  = 0x19,\r
-  EfiProcessorFamilyK5Reserved1         = 0x1A,\r
-  EfiProcessorFamilyK5Reserved2         = 0x1B,\r
-  EfiProcessorFamilyK5Reserved3         = 0x1C,\r
-  EfiProcessorFamilyK5Reserved4         = 0x1D,\r
-  EfiProcessorFamilyK5Reserved5         = 0x1E,\r
-  EfiProcessorFamilyK5Reserved6         = 0x1F,\r
-  EfiProcessorFamilyPowerPC             = 0x20,\r
-  EfiProcessorFamilyPowerPC601          = 0x21,\r
-  EfiProcessorFamilyPowerPC603          = 0x22,\r
-  EfiProcessorFamilyPowerPC603Plus      = 0x23,\r
-  EfiProcessorFamilyPowerPC604          = 0x24,\r
-  EfiProcessorFamilyPowerPC620          = 0x25, \r
-  EfiProcessorFamilyPowerPC704          = 0x26, \r
-  EfiProcessorFamilyPowerPC750          = 0x27, \r
-  EfiProcessorFamilyAlpha2              = 0x30,\r
-  EfiProcessorFamilyAlpha21064          = 0x31, \r
-  EfiProcessorFamilyAlpha21066          = 0x32, \r
-  EfiProcessorFamilyAlpha21164          = 0x33, \r
-  EfiProcessorFamilyAlpha21164PC        = 0x34, \r
-  EfiProcessorFamilyAlpha21164a         = 0x35, \r
-  EfiProcessorFamilyAlpha21264          = 0x36, \r
-  EfiProcessorFamilyAlpha21364          = 0x37,  \r
-  EfiProcessorFamilyMips                = 0x40,\r
-  EfiProcessorFamilyMIPSR4000           = 0x41, \r
-  EfiProcessorFamilyMIPSR4200           = 0x42, \r
-  EfiProcessorFamilyMIPSR4400           = 0x43, \r
-  EfiProcessorFamilyMIPSR4600           = 0x44, \r
-  EfiProcessorFamilyMIPSR10000          = 0x45,   \r
-  EfiProcessorFamilySparc               = 0x50,\r
-  EfiProcessorFamilySuperSparc          = 0x51, \r
-  EfiProcessorFamilymicroSparcII        = 0x52, \r
-  EfiProcessorFamilymicroSparcIIep      = 0x53, \r
-  EfiProcessorFamilyUltraSparc          = 0x54, \r
-  EfiProcessorFamilyUltraSparcII        = 0x55, \r
-  EfiProcessorFamilyUltraSparcIIi       = 0x56, \r
-  EfiProcessorFamilyUltraSparcIII       = 0x57, \r
-  EfiProcessorFamilyUltraSparcIIIi      = 0x58,   \r
-  EfiProcessorFamily68040               = 0x60,\r
-  EfiProcessorFamily68xxx               = 0x61,\r
-  EfiProcessorFamily68000               = 0x62,\r
-  EfiProcessorFamily68010               = 0x63,\r
-  EfiProcessorFamily68020               = 0x64,\r
-  EfiProcessorFamily68030               = 0x65,\r
-  EfiProcessorFamilyHobbit              = 0x70,\r
-  EfiProcessorFamilyCrusoeTM5000        = 0x78, \r
-  EfiProcessorFamilyCrusoeTM3000        = 0x79,\r
-  EfiProcessorFamilyWeitek              = 0x80,\r
-  EfiProcessorFamilyItanium             = 0x82, \r
-  EfiProcessorFamilyAmdAthlon64         = 0x83, \r
-  EfiProcessorFamilyAmdOpteron          = 0x84,\r
-  EfiProcessorFamilyPARISC              = 0x90,\r
-  EfiProcessorFamilyPaRisc8500          = 0x91, \r
-  EfiProcessorFamilyPaRisc8000          = 0x92, \r
-  EfiProcessorFamilyPaRisc7300LC        = 0x93, \r
-  EfiProcessorFamilyPaRisc7200          = 0x94, \r
-  EfiProcessorFamilyPaRisc7100LC        = 0x95, \r
-  EfiProcessorFamilyPaRisc7100          = 0x96,\r
-  EfiProcessorFamilyV30                 = 0xA0,\r
-  EfiProcessorFamilyPentiumIIIXeon      = 0xB0,\r
-  EfiProcessorFamilyPentiumIIISpeedStep = 0xB1,\r
-  EfiProcessorFamilyPentium4            = 0xB2,\r
-  EfiProcessorFamilyIntelXeon           = 0xB3,\r
-  EfiProcessorFamilyAS400               = 0xB4,\r
-  EfiProcessorFamilyIntelXeonMP         = 0xB5,\r
-  EfiProcessorFamilyAMDAthlonXP         = 0xB6,\r
-  EfiProcessorFamilyAMDAthlonMP         = 0xB7,\r
-  EfiProcessorFamilyIntelPentiumM       = 0xB9,\r
-  EfiProcessorFamilyIntelCeleronD       = 0xBA,\r
-  EfiProcessorFamilyIntelPentiumD       = 0xBB,\r
-  EfiProcessorFamilyIntelPentiumEx      = 0xBC,\r
-  EfiProcessorFamilyIBM390              = 0xC8,\r
-  EfiProcessorFamilyG4                  = 0xC9,\r
-  EfiProcessorFamilyG5                  = 0xCA,\r
-  EfiProcessorFamilyi860                = 0xFA,\r
-  EfiProcessorFamilyi960                = 0xFB\r
+  EfiProcessorFamilyOther                  = 0x01, \r
+  EfiProcessorFamilyUnknown                = 0x02,\r
+  EfiProcessorFamily8086                   = 0x03, \r
+  EfiProcessorFamily80286                  = 0x04,\r
+  EfiProcessorFamilyIntel386               = 0x05, \r
+  EfiProcessorFamilyIntel486               = 0x06,\r
+  EfiProcessorFamily8087                   = 0x07,\r
+  EfiProcessorFamily80287                  = 0x08,\r
+  EfiProcessorFamily80387                  = 0x09, \r
+  EfiProcessorFamily80487                  = 0x0A,\r
+  EfiProcessorFamilyPentium                = 0x0B, \r
+  EfiProcessorFamilyPentiumPro             = 0x0C,\r
+  EfiProcessorFamilyPentiumII              = 0x0D,\r
+  EfiProcessorFamilyPentiumMMX             = 0x0E,\r
+  EfiProcessorFamilyCeleron                = 0x0F,\r
+  EfiProcessorFamilyPentiumIIXeon          = 0x10,\r
+  EfiProcessorFamilyPentiumIII             = 0x11, \r
+  EfiProcessorFamilyM1                     = 0x12,\r
+  EfiProcessorFamilyM2                     = 0x13,\r
+  EfiProcessorFamilyM1Reserved2            = 0x14,\r
+  EfiProcessorFamilyM1Reserved3            = 0x15,\r
+  EfiProcessorFamilyM1Reserved4            = 0x16,\r
+  EfiProcessorFamilyM1Reserved5            = 0x17,\r
+  EfiProcessorFamilyAmdDuron               = 0x18,\r
+  EfiProcessorFamilyK5                     = 0x19, \r
+  EfiProcessorFamilyK6                     = 0x1A,\r
+  EfiProcessorFamilyK6_2                   = 0x1B,\r
+  EfiProcessorFamilyK6_3                   = 0x1C,\r
+  EfiProcessorFamilyAmdAthlon              = 0x1D,\r
+  EfiProcessorFamilyAmd29000               = 0x1E,\r
+  EfiProcessorFamilyK6_2Plus               = 0x1F,\r
+  EfiProcessorFamilyPowerPC                = 0x20,\r
+  EfiProcessorFamilyPowerPC601             = 0x21,\r
+  EfiProcessorFamilyPowerPC603             = 0x22,\r
+  EfiProcessorFamilyPowerPC603Plus         = 0x23,\r
+  EfiProcessorFamilyPowerPC604             = 0x24,\r
+  EfiProcessorFamilyPowerPC620             = 0x25,\r
+  EfiProcessorFamilyPowerPCx704            = 0x26,\r
+  EfiProcessorFamilyPowerPC750             = 0x27,\r
+  EfiProcessorFamilyAlpha3                 = 0x30,\r
+  EfiProcessorFamilyAlpha21064             = 0x31,\r
+  EfiProcessorFamilyAlpha21066             = 0x32,\r
+  EfiProcessorFamilyAlpha21164             = 0x33,\r
+  EfiProcessorFamilyAlpha21164PC           = 0x34,\r
+  EfiProcessorFamilyAlpha21164a            = 0x35,\r
+  EfiProcessorFamilyAlpha21264             = 0x36,\r
+  EfiProcessorFamilyAlpha21364             = 0x37,\r
+  EfiProcessorFamilyMips                   = 0x40,\r
+  EfiProcessorFamilyMIPSR4000              = 0x41,\r
+  EfiProcessorFamilyMIPSR4200              = 0x42,\r
+  EfiProcessorFamilyMIPSR4400              = 0x43,\r
+  EfiProcessorFamilyMIPSR4600              = 0x44,\r
+  EfiProcessorFamilyMIPSR10000             = 0x45,\r
+  EfiProcessorFamilySparc                  = 0x50,\r
+  EfiProcessorFamilySuperSparc             = 0x51,\r
+  EfiProcessorFamilymicroSparcII           = 0x52,\r
+  EfiProcessorFamilymicroSparcIIep         = 0x53,\r
+  EfiProcessorFamilyUltraSparc             = 0x54,\r
+  EfiProcessorFamilyUltraSparcII           = 0x55,\r
+  EfiProcessorFamilyUltraSparcIIi          = 0x56,\r
+  EfiProcessorFamilyUltraSparcIII          = 0x57,\r
+  EfiProcessorFamilyUltraSparcIIIi         = 0x58,\r
+  EfiProcessorFamily68040                  = 0x60,\r
+  EfiProcessorFamily68xxx                  = 0x61,\r
+  EfiProcessorFamily68000                  = 0x62,\r
+  EfiProcessorFamily68010                  = 0x63,\r
+  EfiProcessorFamily68020                  = 0x64,\r
+  EfiProcessorFamily68030                  = 0x65,\r
+  EfiProcessorFamilyHobbit                 = 0x70,\r
+  EfiProcessorFamilyCrusoeTM5000           = 0x78,\r
+  EfiProcessorFamilyCrusoeTM3000           = 0x79,\r
+  EfiProcessorFamilyEfficeonTM8000         = 0x7A,\r
+  EfiProcessorFamilyWeitek                 = 0x80,\r
+  EfiProcessorFamilyItanium                = 0x82,\r
+  EfiProcessorFamilyAmdAthlon64            = 0x83,\r
+  EfiProcessorFamilyAmdOpteron             = 0x84,\r
+  EfiProcessorFamilyAmdSempron             = 0x85,\r
+  EfiProcessorFamilyAmdTurion64Mobile      = 0x86,\r
+  EfiProcessorFamilyDualCoreAmdOpteron     = 0x87,\r
+  EfiProcessorFamilyAmdAthlon64X2DualCore  = 0x88,\r
+  EfiProcessorFamilyAmdTurion64X2Mobile    = 0x89,\r
+  EfiProcessorFamilyPARISC                 = 0x90,\r
+  EfiProcessorFamilyPaRisc8500             = 0x91,\r
+  EfiProcessorFamilyPaRisc8000             = 0x92,\r
+  EfiProcessorFamilyPaRisc7300LC           = 0x93,\r
+  EfiProcessorFamilyPaRisc7200             = 0x94,\r
+  EfiProcessorFamilyPaRisc7100LC           = 0x95,\r
+  EfiProcessorFamilyPaRisc7100             = 0x96,\r
+  EfiProcessorFamilyV30                    = 0xA0,\r
+  EfiProcessorFamilyPentiumIIIXeon         = 0xB0,\r
+  EfiProcessorFamilyPentiumIIISpeedStep    = 0xB1,\r
+  EfiProcessorFamilyPentium4               = 0xB2,\r
+  EfiProcessorFamilyIntelXeon              = 0xB3,\r
+  EfiProcessorFamilyAS400                  = 0xB4,\r
+  EfiProcessorFamilyIntelXeonMP            = 0xB5,\r
+  EfiProcessorFamilyAMDAthlonXP            = 0xB6,\r
+  EfiProcessorFamilyAMDAthlonMP            = 0xB7,\r
+  EfiProcessorFamilyIntelItanium2          = 0xB8,\r
+  EfiProcessorFamilyIntelPentiumM          = 0xB9,\r
+  EfiProcessorFamilyIntelCeleronD          = 0xBA,\r
+  EfiProcessorFamilyIntelPentiumD          = 0xBB,\r
+  EfiProcessorFamilyIntelPentiumEx         = 0xBC,\r
+  EfiProcessorFamilyIntelCoreSolo          = 0xBD,  ///< SMBIOS spec 2.6 correct this value\r
+  EfiProcessorFamilyReserved               = 0xBE,\r
+  EfiProcessorFamilyIntelCore2             = 0xBF,\r
+  EfiProcessorFamilyIBM390                 = 0xC8,\r
+  EfiProcessorFamilyG4                     = 0xC9,\r
+  EfiProcessorFamilyG5                     = 0xCA,\r
+  EfiProcessorFamilyG6                     = 0xCB,\r
+  EfiProcessorFamilyzArchitectur           = 0xCC,\r
+  EfiProcessorFamilyViaC7M                 = 0xD2,\r
+  EfiProcessorFamilyViaC7D                 = 0xD3,\r
+  EfiProcessorFamilyViaC7                  = 0xD4,\r
+  EfiProcessorFamilyViaEden                = 0xD5,\r
+  EfiProcessorFamilyi860                   = 0xFA,\r
+  EfiProcessorFamilyi960                   = 0xFB,\r
+  EfiProcessorFamilyIndicatorFamily2       = 0xFE,\r
+  EfiProcessorFamilyReserved1              = 0xFF\r
 } EFI_PROCESSOR_FAMILY_DATA;\r
 \r
 ///\r
@@ -1226,11 +1244,15 @@ typedef struct {
 \r
 typedef struct {\r
   UINT8                             Five    :1;\r
-  UINT8                             There   :1;\r
+  UINT8                             Three   :1;\r
   UINT8                             Two     :1;\r
   UINT8                             Reserved:5;\r
 } EFI_MEMORY_MODULE_VOLTAGE_TYPE;\r
 \r
+//\r
+//  EFI_MEMORY_CONTROLLER_INFORMATION is obsolete\r
+//  Use EFI_MEMORY_CONTROLLER_INFORMATION_DATA instead\r
+//\r
 typedef struct {\r
   EFI_MEMORY_ERROR_DETECT_METHOD_TYPE ErrorDetectingMethod;\r
   EFI_MEMORY_ERROR_CORRECT_CAPABILITY ErrorCorrectingCapability;\r
@@ -1245,6 +1267,20 @@ typedef struct {
   UINT16                              *MemoryModuleConfigHandles;\r
 } EFI_MEMORY_CONTROLLER_INFORMATION;\r
 \r
+typedef struct {\r
+  EFI_MEMORY_ERROR_DETECT_METHOD_TYPE   ErrorDetectingMethod;\r
+  EFI_MEMORY_ERROR_CORRECT_CAPABILITY   ErrorCorrectingCapability;\r
+  EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE    MemorySupportedInterleave;\r
+  EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE    MemoryCurrentInterleave;\r
+  UINT8                                 MaxMemoryModuleSize;\r
+  EFI_MEMORY_SPEED_TYPE                 MemorySpeedType;\r
+  EFI_MEMORY_SUPPORTED_TYPE             MemorySupportedType;\r
+  EFI_MEMORY_MODULE_VOLTAGE_TYPE        MemoryModuleVoltage;\r
+  UINT8                                 NumberofMemorySlot;\r
+  EFI_MEMORY_ERROR_CORRECT_CAPABILITY   EnabledCorrectingCapability;\r
+  EFI_INTER_LINK_DATA                   MemoryModuleConfig[1];\r
+} EFI_MEMORY_CONTROLLER_INFORMATION_DATA;\r
+\r
 //\r
 //  Memory. Error Information - SMBIOS Type 18\r
 //\r
@@ -1538,8 +1574,9 @@ typedef enum {
 } EFI_MISC_CHASSIS_SECURITY_STATE;\r
 \r
 typedef struct {\r
-  UINT32                            RecordType:1;\r
-  UINT32                            Reserved:24;\r
+  UINT32                            RecordType :1;\r
+  UINT32                            Type       :7;\r
+  UINT32                            Reserved   :24;\r
 } EFI_MISC_ELEMENT_TYPE;\r
 \r
 typedef struct {\r