Rollback r17113.

[mirror_edk2.git] / MdePkg / Include / Guid / StatusCodeDataTypeId.h

diff --git a/MdePkg/Include/Guid/StatusCodeDataTypeId.h b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
index b5507643bd65d77fc92ed1958ee91f69fbbe70b2..21d6359e69e9cbcb9ce5ec392596914081c818c4 100644 (file)
--- a/MdePkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
@@ -1,8 +1,8 @@
 /** @file\r
   GUID used to identify id for the caller who is initiating the Status Code.\r
 \r
-  Copyright (c) 2006, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2013, 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
   http://opensource.org/licenses/bsd-license.php\r
@@ -27,9 +27,7 @@
 ///\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
+\r
 typedef enum {\r
   ///\r
   /// A NULL-terminated ASCII string.\r
@@ -104,8 +102,6 @@ typedef struct {
   EFI_STATUS_CODE_STRING         String;\r
 } EFI_STATUS_CODE_STRING_DATA;\r
 \r
-#pragma pack()\r
-\r
 extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;\r
 \r
 ///\r
@@ -126,8 +122,6 @@ extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;
 #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
 /// Extended data about the device path, which is used for many errors and \r
 /// progress codes to point to the device.\r
@@ -154,12 +148,12 @@ typedef struct {
   ///\r
   EFI_STATUS_CODE_DATA                 DataHeader;\r
   ///\r
-  /// The device path to the controller or the hardware device. Note that this parameter is a\r
-  /// variable-length device path structure and not a pointer to such a structure. This\r
-  /// structure is populated only if it is a physical device. For virtual devices, the Size\r
-  /// field in DataHeader is set to zero and this field is not populated.\r
+  /// The device path to the controller or the hardware device. Note that this parameter is a \r
+  /// variable-length device path structure and not a pointer to such a structure. This structure is\r
+  /// populated only if it is a physical device. For virtual devices, the Size field in DataHeader\r
+  /// is set to zero and this field is not populated.\r
   ///\r
-  UINT8                                *DevicePath;\r
+  //  EFI_DEVICE_PATH_PROTOCOL         DevicePath;\r
 } EFI_DEVICE_PATH_EXTENDED_DATA;\r
 \r
 ///\r
@@ -229,21 +223,21 @@ typedef struct {
   ///\r
   UINT16                             AllocResSize;\r
   ///\r
-  /// The device path to the controller or the hardware device that did not get the requested\r
-  /// resources. Note that this parameter is the variable-length device path structure and not\r
-  /// a pointer to this structure.\r
+  /// The device path to the controller or the hardware device that did not get the requested \r
+  /// resources. Note that this parameter is the variable-length device path structure and not \r
+  /// a pointer to this structure. \r
   ///\r
-  UINT8                              *DevicePath;\r
+  //  EFI_DEVICE_PATH_PROTOCOL       DevicePath;\r
   ///\r
   /// The requested resources in the format of an ACPI 2.0 resource descriptor. This\r
   /// parameter is not a pointer; it is the complete resource descriptor.\r
   ///\r
-  UINT8                              *ReqRes;\r
+  //  UINT8                          ReqRes[];\r
   ///\r
-  /// The allocated resources in the format of an ACPI 2.0 resource descriptor. This\r
+  /// The allocated resources in the format of an ACPI 2.0 resource descriptor. This \r
   /// parameter is not a pointer; it is the complete resource descriptor.\r
   ///\r
-  UINT8                              *AllocRes;\r
+  //  UINT8                          AllocRes[];\r
 } EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA;\r
 \r
 ///\r
@@ -692,6 +686,18 @@ typedef union {
   /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.\r
   ///\r
   EFI_SYSTEM_CONTEXT_IPF  SystemContextIpf;\r
+  ///\r
+  /// The context of the X64 processor when the exception was generated. Type\r
+  /// EFI_SYSTEM_CONTEXT_X64 is defined in the\r
+  /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.\r
+  ///\r
+  EFI_SYSTEM_CONTEXT_X64  SystemContextX64; \r
+  ///\r
+  /// The context of the ARM processor when the exception was generated. Type\r
+  /// EFI_SYSTEM_CONTEXT_ARM is defined in the\r
+  /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.\r
+  ///\r
+  EFI_SYSTEM_CONTEXT_ARM  SystemContextArm;\r
 } EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT;\r
 \r
 ///\r
@@ -746,11 +752,11 @@ typedef struct {
   ///\r
   UINT16                         DevicePathSize;\r
   ///\r
-  /// Matches the RemainingDevicePath parameter being passed to the Start() \r
-  /// function. Note that this parameter is the variable-length device path and not a pointer \r
+  /// Matches the RemainingDevicePath parameter being passed to the Start() function. \r
+  /// Note that this parameter is the variable-length device path and not a pointer \r
   /// to the device path.\r
   ///  \r
-  UINT8                          *RemainingDevicePath;\r
+  //  EFI_DEVICE_PATH_PROTOCOL   RemainingDevicePath;\r
 } EFI_STATUS_CODE_START_EXTENDED_DATA;\r
 \r
 ///\r
@@ -778,8 +784,6 @@ typedef struct {
   EFI_PHYSICAL_ADDRESS  RomImageBase;\r
 } EFI_LEGACY_OPROM_EXTENDED_DATA;\r
 \r
-#pragma pack()\r
-\r
 extern EFI_GUID gEfiStatusCodeSpecificDataGuid;\r
 \r
 #endif\r