Fix the wrong structure definition in Smbios.h.

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

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index f61d949e831ddcca233883806a28b90d5062965d..62a2cf7088f752ccb650de4edbb20b06beea7ef8 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -175,7 +175,7 @@ typedef struct {
   SMBIOS_TABLE_STRING     Version;\r
   SMBIOS_TABLE_STRING     SerialNumber;\r
   GUID                    Uuid;\r
-  MISC_SYSTEM_WAKEUP_TYPE WakeUpType;\r
+  UINT8                   WakeUpType;           ///< enumeration value from MISC_SYSTEM_WAKEUP_TYPE\r
   SMBIOS_TABLE_STRING     SKUNumber;\r
   SMBIOS_TABLE_STRING     Family;\r
 } SMBIOS_TABLE_TYPE1;\r
@@ -227,7 +227,7 @@ typedef struct {
   BASE_BOARD_FEATURE_FLAGS  FeatureFlag;\r
   SMBIOS_TABLE_STRING       LocationInChassis;\r
   UINT16                    ChassisHandle;\r
-  BASE_BOARD_TYPE           BoardType;\r
+  UINT8                     BoardType;              ///< enumeration value from BASE_BOARD_TYPE\r
   UINT8                     NumberOfContainedObjectHandles;\r
   UINT16                    ContainedObjectHandles[1];\r
 } SMBIOS_TABLE_TYPE2;\r
@@ -316,10 +316,10 @@ typedef struct {
   SMBIOS_TABLE_STRING         Version;\r
   SMBIOS_TABLE_STRING         SerialNumber;\r
   SMBIOS_TABLE_STRING         AssetTag;\r
-  MISC_CHASSIS_STATE          BootupState;\r
-  MISC_CHASSIS_STATE          PowerSupplyState;\r
-  MISC_CHASSIS_STATE          ThermalState;\r
-  MISC_CHASSIS_SECURITY_STATE SecurityStatus;\r
+  UINT8                       BootupState;            ///< enumeration value from MISC_CHASSIS_STATE\r
+  UINT8                       PowerSupplyState;       ///< enumeration value from MISC_CHASSIS_STATE\r
+  UINT8                       ThermalState;           ///< enumeration value from MISC_CHASSIS_STATE\r
+  UINT8                       SecurityStatus;         ///< enumeration value from MISC_CHASSIS_SECURITY_STATE\r
   UINT8                       OemDefined[4];\r
   UINT8                       Height;\r
   UINT8                       NumberofPowerCords;\r
@@ -520,13 +520,6 @@ typedef struct {
   UINT32  ProcessorReserved2: 4;\r
 } PROCESSOR_SIGNATURE;\r
 \r
-typedef struct {\r
-  UINT32  ProcessorBrandIndex :8;\r
-  UINT32  ProcessorClflush    :8;\r
-  UINT32  ProcessorReserved   :8;\r
-  UINT32  ProcessorDfltApicId :8;\r
-} PROCESSOR_MISC_INFO;\r
-\r
 typedef struct {\r
   UINT32  ProcessorFpu       :1;\r
   UINT32  ProcessorVme       :1;\r
@@ -563,8 +556,6 @@ typedef struct {
 \r
 typedef struct {\r
   PROCESSOR_SIGNATURE     Signature;\r
-  PROCESSOR_MISC_INFO     MiscInfo;\r
-  UINT32                  Reserved;\r
   PROCESSOR_FEATURE_FLAGS FeatureFlags;\r
 } PROCESSOR_ID_DATA;\r
 \r
@@ -579,9 +570,9 @@ typedef struct {
 ///\r
 typedef struct { \r
   SMBIOS_STRUCTURE      Hdr;\r
-  UINT8                 Socket;\r
-  PROCESSOR_TYPE_DATA   ProcessorType;\r
-  PROCESSOR_FAMILY_DATA ProcessorFamily;\r
+  SMBIOS_TABLE_STRING   Socket;\r
+  UINT8                 ProcessorType;          ///< enumeration value from PROCESSOR_TYPE_DATA\r
+  UINT8                 ProcessorFamily;        ///< enumeration value from PROCESSOR_FAMILY_DATA\r
   SMBIOS_TABLE_STRING   ProcessorManufacture;\r
   PROCESSOR_ID_DATA     ProcessorId;\r
   SMBIOS_TABLE_STRING   ProcessorVersion;\r
@@ -590,7 +581,7 @@ typedef struct {
   UINT16                MaxSpeed;\r
   UINT16                CurrentSpeed;\r
   UINT8                 Status;\r
-  PROCESSOR_UPGRADE     ProcessorUpgrade;\r
+  UINT8                 ProcessorUpgrade;      ///< enumeration value from PROCESSOR_UPGRADE\r
   UINT16                L1CacheHandle;\r
   UINT16                L2CacheHandle;\r
   UINT16                L3CacheHandle;\r
@@ -676,10 +667,10 @@ typedef struct {
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                Hdr;\r
-  MEMORY_ERROR_DETECT_METHOD      ErrDetectMethod;\r
+  UINT8                           ErrDetectMethod;            ///< enumeration value from MEMORY_ERROR_DETECT_METHOD\r
   MEMORY_ERROR_CORRECT_CAPABILITY ErrCorrectCapability;\r
-  MEMORY_SUPPORT_INTERLEAVE_TYPE  SupportInterleave;\r
-  UINT8                           CurrentInterleave;\r
+  UINT8                           SupportInterleave;          ///< enumeration value from MEMORY_SUPPORT_INTERLEAVE_TYPE\r
+  UINT8                           CurrentInterleave;          ///< enumeration value from MEMORY_SUPPORT_INTERLEAVE_TYPE      \r
   UINT8                           MaxMemoryModuleSize;\r
   MEMORY_SPEED_TYPE               SupportSpeed;\r
   UINT16                          SupportMemoryType;\r
@@ -805,9 +796,9 @@ typedef struct {
   CACHE_SRAM_TYPE_DATA      SupportedSRAMType;\r
   CACHE_SRAM_TYPE_DATA      CurrentSRAMType;\r
   UINT8                     CacheSpeed;\r
-  CACHE_ERROR_TYPE_DATA     ErrorCorrectionType;\r
-  CACHE_TYPE_DATA           SystemCacheType;\r
-  CACHE_ASSOCIATIVITY_DATA  Associativity;\r
+  UINT8                     ErrorCorrectionType;            ///< enumeration value from CACHE_ERROR_TYPE_DATA\r
+  UINT8                     SystemCacheType;                ///< enumeration value from CACHE_TYPE_DATA\r
+  UINT8                     Associativity;                  ///< enumeration value from CACHE_ASSOCIATIVITY_DATA\r
 } SMBIOS_TABLE_TYPE7;\r
 \r
 ///\r
@@ -907,10 +898,10 @@ typedef enum {
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
   SMBIOS_TABLE_STRING       InternalReferenceDesignator;\r
-  MISC_PORT_CONNECTOR_TYPE  InternalConnectorType;\r
+  UINT8                     InternalConnectorType;          ///< enumeration value from MISC_PORT_CONNECTOR_TYPE\r
   SMBIOS_TABLE_STRING       ExternalReferenceDesignator;\r
-  MISC_PORT_CONNECTOR_TYPE  ExternalConnectorType;\r
-  MISC_PORT_TYPE            PortType;\r
+  UINT8                     ExternalConnectorType;          ///< enumeration value from MISC_PORT_CONNECTOR_TYPE\r
+  UINT8                     PortType;                       ///< enumeration value from MISC_PORT_TYPE\r
 } SMBIOS_TABLE_TYPE8;\r
 \r
 ///\r
@@ -1022,10 +1013,10 @@ typedef struct {
 typedef struct {\r
   SMBIOS_STRUCTURE            Hdr;\r
   SMBIOS_TABLE_STRING         SlotDesignation;\r
-  MISC_SLOT_TYPE              SlotType;\r
-  MISC_SLOT_DATA_BUS_WIDTH    SlotDataBusWidth;\r
-  MISC_SLOT_USAGE             CurrentUsage;\r
-  MISC_SLOT_LENGTH            SlotLength;\r
+  UINT8                       SlotType;                 ///< enumeration value from MISC_SLOT_TYPE\r
+  UINT8                       SlotDataBusWidth;         ///< enumeration value from MISC_SLOT_DATA_BUS_WIDTH\r
+  UINT8                       CurrentUsage;             ///< enumeration value from MISC_SLOT_USAGE\r
+  UINT8                       SlotLength;               ///< enumeration value from MISC_SLOT_LENGTH\r
   UINT16                      SlotID;\r
   MISC_SLOT_CHARACTERISTICS1  SlotCharacteristics1;\r
   MISC_SLOT_CHARACTERISTICS2  SlotCharacteristics2;\r
@@ -1054,7 +1045,8 @@ typedef enum {
 /// Device Item Entry\r
 ///\r
 typedef struct {\r
-  MISC_ONBOARD_DEVICE_TYPE  DeviceType;\r
+  UINT8                     DeviceType;             ///< Bit [6:0] - enumeration type of device from MISC_ONBOARD_DEVICE_TYPE\r
+                                                    ///< Bit 7     - 1 : device enabled, 0 : device disabled\r
   SMBIOS_TABLE_STRING       DescriptionString;\r
 } DEVICE_STRUCT;\r
 \r
@@ -1166,7 +1158,7 @@ typedef struct {
 /// Event Log Type Descriptors\r
 ///\r
 typedef struct {\r
-  EVENT_LOG_TYPE_DATA   LogType;\r
+  UINT8                 LogType;                    ///< enumeration value from EVENT_LOG_TYPE_DATA\r
   UINT8                 DataFormatType;\r
 } EVENT_LOG_TYPE;\r
 \r
@@ -1260,9 +1252,9 @@ typedef enum {
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
-  MEMORY_ARRAY_LOCATION     Location;\r
-  MEMORY_ARRAY_USE          Use;\r
-  MEMORY_ERROR_CORRECTION   MemoryErrorCorrection;\r
+  UINT8                     Location;                       ///< enumeration value from MEMORY_ARRAY_LOCATION\r
+  UINT8                     Use;                            ///< enumeration value from MEMORY_ARRAY_USE\r
+  UINT8                     MemoryErrorCorrection;          ///< enumeration value from MEMORY_ERROR_CORRECTION\r
   UINT32                    MaximumCapacity;\r
   UINT16                    MemoryErrorInformationHandle;\r
   UINT16                    NumberOfMemoryDevices;\r
@@ -1348,11 +1340,11 @@ typedef struct {
   UINT16                    TotalWidth;\r
   UINT16                    DataWidth;\r
   UINT16                    Size;\r
-  MEMORY_FORM_FACTOR        FormFactor;\r
+  UINT8                     FormFactor;                     ///< enumeration value from MEMORY_FORM_FACTOR\r
   UINT8                     DeviceSet;\r
   SMBIOS_TABLE_STRING       DeviceLocator;\r
   SMBIOS_TABLE_STRING       BankLocator;\r
-  MEMORY_DEVICE_TYPE        MemoryType;\r
+  UINT8                     MemoryType;                     ///< enumeration value from MEMORY_DEVICE_TYPE\r
   MEMORY_DEVICE_TYPE_DETAIL TypeDetail;\r
   UINT16                    Speed;\r
   SMBIOS_TABLE_STRING       Manufacturer;\r
@@ -1414,9 +1406,9 @@ typedef enum {
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
-  MEMORY_ERROR_TYPE         ErrorType;\r
-  MEMORY_ERROR_GRANULARITY  ErrorGranularity;\r
-  MEMORY_ERROR_OPERATION    ErrorOperation;\r
+  UINT8                     ErrorType;                  ///< enumeration value from MEMORY_ERROR_TYPE\r
+  UINT8                     ErrorGranularity;           ///< enumeration value from MEMORY_ERROR_GRANULARITY\r
+  UINT8                     ErrorOperation;             ///< enumeration value from MEMORY_ERROR_OPERATION\r
   UINT32                    VendorSyndrome;\r
   UINT32                    MemoryArrayErrorAddress;\r
   UINT32                    DeviceErrorAddress;\r
@@ -1495,8 +1487,8 @@ typedef enum {
 ///\r
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
-  BUILTIN_POINTING_DEVICE_TYPE      Type;\r
-  BUILTIN_POINTING_DEVICE_INTERFACE Interface;\r
+  UINT8                             Type;                   ///< enumeration value from BUILTIN_POINTING_DEVICE_TYPE\r
+  UINT8                             Interface;              ///< enumeration value from BUILTIN_POINTING_DEVICE_INTERFACE\r
   UINT8                             NumberOfButtons;\r
 } SMBIOS_TABLE_TYPE21;\r
 \r
@@ -1528,7 +1520,7 @@ typedef struct {
   SMBIOS_TABLE_STRING               ManufactureDate;\r
   SMBIOS_TABLE_STRING               SerialNumber;\r
   SMBIOS_TABLE_STRING               DeviceName;\r
-  PORTABLE_BATTERY_DEVICE_CHEMISTRY DeviceChemistry;\r
+  UINT8                             DeviceChemistry;              ///< enumeration value from PORTABLE_BATTERY_DEVICE_CHEMISTRY\r
   UINT16                            DeviceCapacity;\r
   UINT16                            DesignVoltage;\r
   SMBIOS_TABLE_STRING               SBDSVersionNumber;\r
@@ -1750,7 +1742,7 @@ typedef enum {
 typedef struct {\r
   SMBIOS_STRUCTURE                        Hdr;\r
   UINT8                                   Reserved[6];\r
-  MISC_BOOT_INFORMATION_STATUS_DATA_TYPE  BootStatus;\r
+  UINT8                                   BootStatus;     ///< enumeration value from MISC_BOOT_INFORMATION_STATUS_DATA_TYPE\r
 } SMBIOS_TABLE_TYPE32;\r
 \r
 ///\r
@@ -1761,9 +1753,9 @@ typedef struct {
 ///    \r
 typedef struct {\r
   SMBIOS_STRUCTURE          Hdr;\r
-  MEMORY_ERROR_TYPE         ErrorType;          ///< Same as Type 18\r
-  MEMORY_ERROR_GRANULARITY  ErrorGranularity;   ///< Same as Type 18\r
-  MEMORY_ERROR_OPERATION    ErrorOperation;     ///< Same as Type 18\r
+  UINT8                     ErrorType;                    ///< enumeration value from MEMORY_ERROR_TYPE\r
+  UINT8                     ErrorGranularity;             ///< enumeration value from MEMORY_ERROR_GRANULARITY\r
+  UINT8                     ErrorOperation;               ///< enumeration value from MEMORY_ERROR_OPERATION\r
   UINT32                    VendorSyndrome;\r
   UINT64                    MemoryArrayErrorAddress;\r
   UINT64                    DeviceErrorAddress;\r
@@ -1810,9 +1802,9 @@ typedef enum {
 typedef struct {\r
   SMBIOS_STRUCTURE                      Hdr;\r
   SMBIOS_TABLE_STRING                   Description;\r
-  MISC_MANAGEMENT_DEVICE_TYPE           Type;\r
+  UINT8                                 Type;                     ///< enumeration value from MISC_MANAGEMENT_DEVICE_TYPE\r
   UINT32                                Address;\r
-  MISC_MANAGEMENT_DEVICE_ADDRESS_TYPE   AddressType;\r
+  UINT8                                 AddressType;              ///< enumeration value from MISC_MANAGEMENT_DEVICE_ADDRESS_TYPE\r
 } SMBIOS_TABLE_TYPE34;\r
 \r
 ///\r
@@ -1897,7 +1889,7 @@ typedef enum {
 /// \r
 typedef struct {\r
   SMBIOS_STRUCTURE      Hdr;\r
-  BMC_INTERFACE_TYPE    InterfaceType;\r
+  UINT8                 InterfaceType;              ///< enumeration value from BMC_INTERFACE_TYPE\r
   UINT8                 IPMISpecificationRevision;\r
   UINT8                 I2CSlaveAddress;\r
   UINT8                 NVStorageDeviceAddress;\r
@@ -1992,7 +1984,7 @@ typedef enum{
 typedef struct {\r
   SMBIOS_STRUCTURE                  Hdr;\r
   SMBIOS_TABLE_STRING               ReferenceDesignation;\r
-  ONBOARD_DEVICE_EXTENDED_INFO_TYPE DeviceType;\r
+  UINT8                             DeviceType;             ///< enumeration value from ONBOARD_DEVICE_EXTENDED_INFO_TYPE\r
   UINT8                             DeviceTypeInstance;\r
   UINT16                            SegmentGroupNum;\r
   UINT8                             BusNum;\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 16d56d9c1543ffe7b42c212bb30cd40f6c802c52..58a279c63f7f97baa71ab9691a2e3a57b4b3aa83 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -23,7 +23,7 @@
   DEC_SPECIFICATION              = 0x00010005\r
   PACKAGE_NAME                   = MdePkg\r
   PACKAGE_GUID                   = 1E73767F-8F52-4603-AEB4-F29B510B6766\r
-  PACKAGE_VERSION                = 0.1\r
+  PACKAGE_VERSION                = 1.00\r
 \r
 \r
 [Includes.common]\r