Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Framework / Guid / DataHubRecords / DataHubSubClassMemory.h

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
index a4b83c33d9670f6afee6d15f36b590ed0e485810..482e69e114f6e8605da50b49644e85c74a562f50 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -140,7 +140,9 @@ typedef enum _EFI_MEMORY_ARRAY_TYPE {
   EfiMemoryTypeRdram                          = 0x11,\r
   EfiMemoryTypeDdr                            = 0x12,\r
   EfiMemoryTypeDdr2                           = 0x13,\r
-  EfiMemoryTypeDdr2FbDimm                     = 0x14\r
+  EfiMemoryTypeDdr2FbDimm                     = 0x14,\r
+  EfiMemoryTypeDdr3                           = 0x18,\r
+  EfiMemoryTypeFbd2                           = 0x19\r
 } EFI_MEMORY_ARRAY_TYPE;\r
 \r
 typedef struct {\r
@@ -189,6 +191,8 @@ typedef struct {
   UINT16                      MemorySpeed;\r
   EFI_MEMORY_STATE            MemoryState;\r
   UINT8                       MemoryAttributes;\r
+  UINT8                       MemoryBankConnections;\r
+  UINT8                       MemoryErrorStatus;\r
 } EFI_MEMORY_ARRAY_LINK;\r
 \r
 \r
@@ -304,11 +308,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
@@ -323,6 +331,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