1) Move the structure definitions related GUID EFI_STATUS_CODE_SPECIFIC_DATA_GUID...
authorklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 10 Aug 2007 09:48:47 +0000 (09:48 +0000)
committerklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 10 Aug 2007 09:48:47 +0000 (09:48 +0000)
2) Remove IntelFrameworkPkg/Framework/StatusCodeDataTypeId.h

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

IntelFrameworkPkg/Include/Framework/StatusCode.h
IntelFrameworkPkg/Include/Framework/StatusCodeDataTypeId.h [deleted file]
IntelFrameworkPkg/Include/FrameworkPei.h
IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h

index 91b9d08..41b7720 100644 (file)
 //\r
 #define EFI_DC_UNSPECIFIED  0x0\r
 \r
+///////////////////////////////////////////////////////////////////////////////\r
+// Common Status Code Definitions\r
+///////////////////////////////////////////////////////////////////////////////\r
+///\r
+/// This is the max data size including all the headers which can be passed\r
+/// as Status Code data. This data should be multiple of 8 byte\r
+/// to avoid any kind of boundary issue. Also, sum of this data size (inclusive\r
+/// of size of EFI_STATUS_CODE_DATA should not exceed the max record size of\r
+/// data hub\r
+///\r
+#define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
+\r
 #endif\r
diff --git a/IntelFrameworkPkg/Include/Framework/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Framework/StatusCodeDataTypeId.h
deleted file mode 100644 (file)
index bbac633..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/** @file\r
-  This file defines the data structures to support Status Code Data.\r
-\r
-  Copyright (c) 2007, Intel Corporation\r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-  Module Name:  FrameworkStatusCodeDataTypeId.h\r
-\r
-  @par Revision Reference:\r
-  These definitions are from Framework of EFI Status Code Spec\r
-  Version 0.92.\r
-\r
-**/\r
-\r
-#ifndef __FRAMEWORK_STATUS_CODE_DATA_TYPE_ID_H__\r
-#define __FRAMEWORK_STATUS_CODE_DATA_TYPE_ID_H__\r
-\r
-#include <Framework/DataHubRecords.h>\r
-#include <Protocol/DebugSupport.h>\r
-\r
-///\r
-/// This is the max data size including all the headers which can be passed\r
-/// as Status Code data. This data should be multiple of 8 byte\r
-/// to avoid any kind of boundary issue. Also, sum of this data size (inclusive\r
-/// of size of EFI_STATUS_CODE_DATA should not exceed the max record size of\r
-/// data hub\r
-///\r
-#define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
-\r
-#pragma pack(1)\r
-typedef enum {\r
-  EfiStringAscii,\r
-  EfiStringUnicode,\r
-  EfiStringToken\r
-} EFI_STRING_TYPE;\r
-\r
-typedef struct {\r
-  EFI_HII_HANDLE  Handle;\r
-  STRING_REF      Token;\r
-} EFI_STATUS_CODE_STRING_TOKEN;\r
-\r
-typedef union {\r
-  CHAR8                         *Ascii;\r
-  CHAR16                        *Unicode;\r
-  EFI_STATUS_CODE_STRING_TOKEN  Hii;\r
-} EFI_STATUS_CODE_STRING;\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA                          DataHeader;\r
-  EFI_STRING_TYPE                               StringType;\r
-  EFI_STATUS_CODE_STRING                        String;\r
-} EFI_STATUS_CODE_STRING_DATA;\r
-\r
-#pragma pack()\r
-\r
-//\r
-// declaration for EFI_EXP_DATA. This may change\r
-//\r
-// typedef UINTN   EFI_EXP_DATA;\r
-\r
-///\r
-/// Voltage Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_EXP_BASE10_DATA   Voltage;\r
-  EFI_EXP_BASE10_DATA   Threshold;\r
-} EFI_COMPUTING_UNIT_VOLTAGE_ERROR_DATA;\r
-\r
-///\r
-/// Microcode Update Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  UINT32                Version;\r
-} EFI_COMPUTING_UNIT_MICROCODE_UPDATE_ERROR_DATA;\r
-\r
-\r
-///\r
-/// Asynchronous Timer Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_EXP_BASE10_DATA   TimerLimit;\r
-} EFI_COMPUTING_UNIT_TIMER_EXPIRED_ERROR_DATA;\r
-\r
-///\r
-/// Host Processor Mismatch Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  UINT32                Instance;\r
-  UINT16                Attributes;\r
-} EFI_HOST_PROCESSOR_MISMATCH_ERROR_DATA;\r
-\r
-//\r
-// EFI_COMPUTING_UNIT_MISMATCH_ATTRIBUTES\r
-// All other attributes are reserved for future use and\r
-// must be initialized to 0.\r
-//\r
-#define EFI_COMPUTING_UNIT_MISMATCH_SPEED       0x0001\r
-#define EFI_COMPUTING_UNIT_MISMATCH_FSB_SPEED   0x0002\r
-#define EFI_COMPUTING_UNIT_MISMATCH_FAMILY      0x0004\r
-#define EFI_COMPUTING_UNIT_MISMATCH_MODEL       0x0008\r
-#define EFI_COMPUTING_UNIT_MISMATCH_STEPPING    0x0010\r
-#define EFI_COMPUTING_UNIT_MISMATCH_CACHE_SIZE  0x0020\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM1        0x1000\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM2        0x2000\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM3        0x4000\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM4        0x8000\r
-\r
-///\r
-/// Thermal Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_EXP_BASE10_DATA   Temperature;\r
-  EFI_EXP_BASE10_DATA   Threshold;\r
-} EFI_COMPUTING_UNIT_THERMAL_ERROR_DATA;\r
-\r
-///\r
-/// Processor Disabled Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  UINT32                Cause;\r
-  BOOLEAN               SoftwareDisabled;\r
-} EFI_COMPUTING_UNIT_CPU_DISABLED_ERROR_DATA;\r
-\r
-\r
-typedef enum {\r
-  EfiInitCacheDataOnly,\r
-  EfiInitCacheInstrOnly,\r
-  EfiInitCacheBoth,\r
-  EfiInitCacheUnspecified\r
-} EFI_INIT_CACHE_TYPE;\r
-\r
-///\r
-/// Embedded cache init extended data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  UINT32                Level;\r
-  EFI_INIT_CACHE_TYPE   Type;\r
-} EFI_CACHE_INIT_DATA;\r
-\r
-//\r
-// Memory Extended Error Data\r
-//\r
-\r
-///\r
-/// Memory Error Granularity Definition\r
-///\r
-typedef UINT8 EFI_MEMORY_ERROR_GRANULARITY;\r
-\r
-///\r
-/// Memory Error Operation Definition\r
-///\r
-typedef UINT8 EFI_MEMORY_ERROR_OPERATION;\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA          DataHeader;\r
-  EFI_MEMORY_ERROR_GRANULARITY  Granularity;\r
-  EFI_MEMORY_ERROR_OPERATION    Operation;\r
-  UINTN                         Syndrome;\r
-  EFI_PHYSICAL_ADDRESS          Address;\r
-  UINTN                         Resolution;\r
-} EFI_MEMORY_EXTENDED_ERROR_DATA;\r
-\r
-typedef struct {\r
-  EFI_MEMORY_ERROR_GRANULARITY  Granularity;\r
-  EFI_MEMORY_ERROR_OPERATION    Operation;\r
-  UINTN                         Syndrome;\r
-  EFI_PHYSICAL_ADDRESS          Address;\r
-  UINTN                         Resolution;\r
-} EFI_MEMORY_EXTENDED_ERROR_DATA_PAYLOAD;\r
-\r
-//\r
-// Memory Error Granularities\r
-//\r
-#define EFI_MEMORY_ERROR_OTHER      0x01\r
-#define EFI_MEMORY_ERROR_UNKNOWN    0x02\r
-#define EFI_MEMORY_ERROR_DEVICE     0x03\r
-#define EFI_MEMORY_ERROR_PARTITION  0x04\r
-\r
-//\r
-// Memory Error Operations\r
-//\r
-#define EFI_MEMORY_OPERATION_OTHER          0x01\r
-#define EFI_MEMORY_OPERATION_UNKNOWN        0x02\r
-#define EFI_MEMORY_OPERATION_READ           0x03\r
-#define EFI_MEMORY_OPERATION_WRITE          0x04\r
-#define EFI_MEMORY_OPERATION_PARTIAL_WRITE  0x05\r
-\r
-//\r
-// Define shorthands to describe Group Operations\r
-// Many memory init operations are essentially group\r
-// operations.\r
-\r
-/// A shorthand to describe that the operation is performed\r
-/// on multiple devices within the array\r
-///\r
-#define EFI_MULTIPLE_MEMORY_DEVICE_OPERATION  0xfffe\r
-///\r
-/// A shorthand to describe that the operation is performed on all devices within the array\r
-///\r
-#define EFI_ALL_MEMORY_DEVICE_OPERATION 0xffff\r
-///\r
-/// A shorthand to describe that the operation is performed on multiple arrays\r
-///\r
-#define EFI_MULTIPLE_MEMORY_ARRAY_OPERATION 0xfffe\r
-///\r
-/// A shorthand to describe that the operation is performed on all the arrays\r
-///\r
-#define EFI_ALL_MEMORY_ARRAY_OPERATION  0xffff\r
-\r
-//\r
-// DIMM number\r
-//\r
-#pragma pack(1)\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  UINT16                Array;\r
-  UINT16                Device;\r
-} EFI_STATUS_CODE_DIMM_NUMBER;\r
-\r
-#pragma pack()\r
-\r
-///\r
-/// Memory Module Mismatch Extended Error Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA        DataHeader;\r
-  EFI_STATUS_CODE_DIMM_NUMBER Instance;\r
-} EFI_MEMORY_MODULE_MISMATCH_ERROR_DATA;\r
-\r
-\r
-///\r
-/// Memory Range Extended Data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_PHYSICAL_ADDRESS  Start;\r
-  EFI_PHYSICAL_ADDRESS  Length;\r
-} EFI_MEMORY_RANGE_EXTENDED_DATA;\r
-\r
-///\r
-/// Device handle Extended Data. Used for many\r
-/// errors and progress codes to point to the device.\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_HANDLE            Handle;\r
-} EFI_DEVICE_HANDLE_EXTENDED_DATA;\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA                 DataHeader;\r
-  UINT8                                *DevicePath;\r
-} EFI_DEVICE_PATH_EXTENDED_DATA;\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA           DataHeader;\r
-  EFI_HANDLE                     ControllerHandle;\r
-  EFI_HANDLE                     DriverBindingHandle;\r
-  UINT16                         DevicePathSize;\r
-  UINT8                          *RemainingDevicePath;\r
-} EFI_STATUS_CODE_START_EXTENDED_DATA;\r
-\r
-typedef struct {\r
-  UINT8                                *DevicePath;\r
-} EFI_DEVICE_PATH_EXTENDED_DATA_PAYLOAD;\r
-\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA               DataHeader;\r
-  UINT32                             Bar;\r
-  UINT16                             DevicePathSize;\r
-  UINT16                             ReqResSize;\r
-  UINT16                             AllocResSize;\r
-  UINT8                              *DevicePath;\r
-  UINT8                              *ReqRes;\r
-  UINT8                              *AllocRes;\r
-} EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA;\r
-\r
-///\r
-/// Extended Error Data for Assert\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA        DataHeader;\r
-  UINT32                      LineNumber;\r
-  UINT32                      FileNameSize;\r
-  EFI_STATUS_CODE_STRING_DATA *FileName;\r
-} EFI_DEBUG_ASSERT_DATA;\r
-\r
-///\r
-/// System Context Data EBC/IA32/IPF\r
-///\r
-typedef union {\r
-  EFI_SYSTEM_CONTEXT_EBC  SystemContextEbc;\r
-  EFI_SYSTEM_CONTEXT_IA32 SystemContextIa32;\r
-  EFI_SYSTEM_CONTEXT_IPF  SystemContextIpf;\r
-} EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT;\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA                  DataHeader;\r
-  EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT  Context;\r
-} EFI_STATUS_CODE_EXCEP_EXTENDED_DATA;\r
-\r
-///\r
-/// Legacy Oprom extended data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_HANDLE            DeviceHandle;\r
-  EFI_PHYSICAL_ADDRESS  RomImageBase;\r
-} EFI_LEGACY_OPROM_EXTENDED_DATA;\r
-\r
-#endif\r
index e88691a..33d0dab 100644 (file)
@@ -28,6 +28,5 @@
 #include <Framework/Hob.h>\r
 #include <Framework/Legacy16.h>\r
 #include <Framework/StatusCode.h>\r
-#include <Framework/StatusCodeDataTypeId.h>\r
 \r
 #endif\r
index 00d2182..dbe8fba 100644 (file)
 #define __STATUS_CODE_DATA_TYPE_ID_GUID_H__\r
 \r
 #include <PiPei.h>\r
+#include <Framework/StatusCode.h>\r
+#include <Framework/DataHubRecords.h>\r
+#include <Protocol/DebugSupport.h>\r
 \r
-//\r
+//////////////////////////////////////////////////////////////////////////////////////////\r
 // String Data Type defintion. This is part of Status Code Specification\r
-//\r
+//////////////////////////////////////////////////////////////////////////////////////////\r
 #define EFI_STATUS_CODE_DATA_TYPE_STRING_GUID \\r
   { 0x92D11080, 0x496F, 0x4D95, { 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A } }\r
 \r
+#pragma pack(1)\r
+\r
+typedef enum {\r
+  EfiStringAscii,\r
+  EfiStringUnicode,\r
+  EfiStringToken\r
+} EFI_STRING_TYPE;\r
+\r
+typedef struct {\r
+  EFI_HII_HANDLE  Handle;\r
+  STRING_REF      Token;\r
+} EFI_STATUS_CODE_STRING_TOKEN;\r
+\r
+typedef union {\r
+  CHAR8                         *Ascii;\r
+  CHAR16                        *Unicode;\r
+  EFI_STATUS_CODE_STRING_TOKEN  Hii;\r
+} EFI_STATUS_CODE_STRING;\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA                          DataHeader;\r
+  EFI_STRING_TYPE                               StringType;\r
+  EFI_STATUS_CODE_STRING                        String;\r
+} EFI_STATUS_CODE_STRING_DATA;\r
+#pragma pack()\r
+\r
 extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;\r
 \r
-//\r
-// This GUID indicates that the format of the accompanying data depends\r
-// upon the Status Code Value, but follows this Specification\r
-//\r
+\r
+//////////////////////////////////////////////////////////////////////////////////////////\r
+// Special Data Type defintion. This is part of Status Code Specification\r
+//////////////////////////////////////////////////////////////////////////////////////////\r
 #define EFI_STATUS_CODE_SPECIFIC_DATA_GUID \\r
   { 0x335984bd, 0xe805, 0x409a, { 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6 } }\r
 \r
+#pragma pack(1)\r
+\r
+///\r
+/// Device handle Extended Data. Used for many\r
+/// errors and progress codes to point to the device.\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  EFI_HANDLE            Handle;\r
+} EFI_DEVICE_HANDLE_EXTENDED_DATA;\r
+\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA                 DataHeader;\r
+  UINT8                                *DevicePath;\r
+} EFI_DEVICE_PATH_EXTENDED_DATA;\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA               DataHeader;\r
+  UINT32                             Bar;\r
+  UINT16                             DevicePathSize;\r
+  UINT16                             ReqResSize;\r
+  UINT16                             AllocResSize;\r
+  UINT8                              *DevicePath;\r
+  UINT8                              *ReqRes;\r
+  UINT8                              *AllocRes;\r
+} EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA;\r
+\r
+///\r
+/// Voltage Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  EFI_EXP_BASE10_DATA   Voltage;\r
+  EFI_EXP_BASE10_DATA   Threshold;\r
+} EFI_COMPUTING_UNIT_VOLTAGE_ERROR_DATA;\r
+\r
+///\r
+/// Microcode Update Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  UINT32                Version;\r
+} EFI_COMPUTING_UNIT_MICROCODE_UPDATE_ERROR_DATA;\r
+\r
+///\r
+/// Asynchronous Timer Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  EFI_EXP_BASE10_DATA   TimerLimit;\r
+} EFI_COMPUTING_UNIT_TIMER_EXPIRED_ERROR_DATA;\r
+\r
+///\r
+/// Host Processor Mismatch Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  UINT32                Instance;\r
+  UINT16                Attributes;\r
+} EFI_HOST_PROCESSOR_MISMATCH_ERROR_DATA;\r
+\r
+///\r
+/// Thermal Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  EFI_EXP_BASE10_DATA   Temperature;\r
+  EFI_EXP_BASE10_DATA   Threshold;\r
+} EFI_COMPUTING_UNIT_THERMAL_ERROR_DATA;\r
+\r
+\r
+typedef enum {\r
+  EfiInitCacheDataOnly,\r
+  EfiInitCacheInstrOnly,\r
+  EfiInitCacheBoth,\r
+  EfiInitCacheUnspecified\r
+} EFI_INIT_CACHE_TYPE;\r
+\r
+///\r
+/// Embedded cache init extended data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  UINT32                Level;\r
+  EFI_INIT_CACHE_TYPE   Type;\r
+} EFI_CACHE_INIT_DATA;\r
+\r
+///\r
+/// Processor Disabled Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  UINT32                Cause;\r
+  BOOLEAN               SoftwareDisabled;\r
+} EFI_COMPUTING_UNIT_CPU_DISABLED_ERROR_DATA;\r
+\r
+///\r
+/// Memory Error Operation Definition\r
+///\r
+typedef UINT8 EFI_MEMORY_ERROR_OPERATION;\r
+\r
+///\r
+/// Memory Error Granularity Definition\r
+///\r
+typedef UINT8 EFI_MEMORY_ERROR_GRANULARITY;\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA          DataHeader;\r
+  EFI_MEMORY_ERROR_GRANULARITY  Granularity;\r
+  EFI_MEMORY_ERROR_OPERATION    Operation;\r
+  UINTN                         Syndrome;\r
+  EFI_PHYSICAL_ADDRESS          Address;\r
+  UINTN                         Resolution;\r
+} EFI_MEMORY_EXTENDED_ERROR_DATA;\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  UINT16                Array;\r
+  UINT16                Device;\r
+} EFI_STATUS_CODE_DIMM_NUMBER;\r
+\r
+///\r
+/// Memory Module Mismatch Extended Error Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA        DataHeader;\r
+  EFI_STATUS_CODE_DIMM_NUMBER Instance;\r
+} EFI_MEMORY_MODULE_MISMATCH_ERROR_DATA;\r
+\r
+///\r
+/// Memory Range Extended Data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  EFI_PHYSICAL_ADDRESS  Start;\r
+  EFI_PHYSICAL_ADDRESS  Length;\r
+} EFI_MEMORY_RANGE_EXTENDED_DATA;\r
+\r
+///\r
+/// Extended Error Data for Assert\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA        DataHeader;\r
+  UINT32                      LineNumber;\r
+  UINT32                      FileNameSize;\r
+  EFI_STATUS_CODE_STRING_DATA *FileName;\r
+} EFI_DEBUG_ASSERT_DATA;\r
+\r
+///\r
+/// System Context Data EBC/IA32/IPF\r
+///\r
+typedef union {\r
+  EFI_SYSTEM_CONTEXT_EBC  SystemContextEbc;\r
+  EFI_SYSTEM_CONTEXT_IA32 SystemContextIa32;\r
+  EFI_SYSTEM_CONTEXT_IPF  SystemContextIpf;\r
+} EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT;\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA                  DataHeader;\r
+  EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT  Context;\r
+} EFI_STATUS_CODE_EXCEP_EXTENDED_DATA;\r
+\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA           DataHeader;\r
+  EFI_HANDLE                     ControllerHandle;\r
+  EFI_HANDLE                     DriverBindingHandle;\r
+  UINT16                         DevicePathSize;\r
+  UINT8                          *RemainingDevicePath;\r
+} EFI_STATUS_CODE_START_EXTENDED_DATA;\r
+\r
+///\r
+/// Legacy Oprom extended data\r
+///\r
+typedef struct {\r
+  EFI_STATUS_CODE_DATA  DataHeader;\r
+  EFI_HANDLE            DeviceHandle;\r
+  EFI_PHYSICAL_ADDRESS  RomImageBase;\r
+} EFI_LEGACY_OPROM_EXTENDED_DATA;\r
+\r
+#pragma pack()\r
+\r
 extern EFI_GUID gEfiStatusCodeSpecificDataGuid;\r
 \r
+//\r
+// EFI_COMPUTING_UNIT_MISMATCH_ATTRIBUTES\r
+// All other attributes are reserved for future use and\r
+// must be initialized to 0.\r
+//\r
+#define EFI_COMPUTING_UNIT_MISMATCH_SPEED       0x0001\r
+#define EFI_COMPUTING_UNIT_MISMATCH_FSB_SPEED   0x0002\r
+#define EFI_COMPUTING_UNIT_MISMATCH_FAMILY      0x0004\r
+#define EFI_COMPUTING_UNIT_MISMATCH_MODEL       0x0008\r
+#define EFI_COMPUTING_UNIT_MISMATCH_STEPPING    0x0010\r
+#define EFI_COMPUTING_UNIT_MISMATCH_CACHE_SIZE  0x0020\r
+#define EFI_COMPUTING_UNIT_MISMATCH_OEM1        0x1000\r
+#define EFI_COMPUTING_UNIT_MISMATCH_OEM2        0x2000\r
+#define EFI_COMPUTING_UNIT_MISMATCH_OEM3        0x4000\r
+#define EFI_COMPUTING_UNIT_MISMATCH_OEM4        0x8000\r
+\r
+\r
+\r
+//\r
+// Memory Error Granularities\r
+//\r
+#define EFI_MEMORY_ERROR_OTHER      0x01\r
+#define EFI_MEMORY_ERROR_UNKNOWN    0x02\r
+#define EFI_MEMORY_ERROR_DEVICE     0x03\r
+#define EFI_MEMORY_ERROR_PARTITION  0x04\r
+\r
+//\r
+// Memory Error Operations\r
+//\r
+#define EFI_MEMORY_OPERATION_OTHER          0x01\r
+#define EFI_MEMORY_OPERATION_UNKNOWN        0x02\r
+#define EFI_MEMORY_OPERATION_READ           0x03\r
+#define EFI_MEMORY_OPERATION_WRITE          0x04\r
+#define EFI_MEMORY_OPERATION_PARTIAL_WRITE  0x05\r
+\r
+//\r
+// Define shorthands to describe Group Operations\r
+// Many memory init operations are essentially group\r
+// operations.\r
+\r
+/// A shorthand to describe that the operation is performed\r
+/// on multiple devices within the array\r
+///\r
+#define EFI_MULTIPLE_MEMORY_DEVICE_OPERATION  0xfffe\r
+///\r
+/// A shorthand to describe that the operation is performed on all devices within the array\r
+///\r
+#define EFI_ALL_MEMORY_DEVICE_OPERATION 0xffff\r
+///\r
+/// A shorthand to describe that the operation is performed on multiple arrays\r
+///\r
+#define EFI_MULTIPLE_MEMORY_ARRAY_OPERATION 0xfffe\r
+///\r
+/// A shorthand to describe that the operation is performed on all the arrays\r
+///\r
+#define EFI_ALL_MEMORY_ARRAY_OPERATION  0xffff\r
+\r
+\r
+\r
+\r
 //\r
 // Debug Assert Data. This is part of Status Code Specification\r
 //\r
@@ -72,7 +343,6 @@ extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;
 \r
 extern EFI_GUID gEfiStatusCodeDataTypeErrorGuid;\r
 \r
-\r
 //\r
 // Progress Code. User Defined Data Type Guid.\r
 //\r
@@ -81,4 +351,5 @@ extern EFI_GUID gEfiStatusCodeDataTypeErrorGuid;
 \r
 extern EFI_GUID gEfiStatusCodeDataTypeProgressCodeGuid;\r
 \r
+\r
 #endif\r