summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2011-04-13 06:14:55 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2011-04-13 06:14:55 +0000
commitec473974a602806f7f28b4e4f4ba8913474e9a00 (patch)
tree31101912a9a4ad20b2e760dc2fc4164823685bfe
parent4b2eb5b0a9d220059f15eabe64d50f6faf1e2c17 (diff)
downloadedk2-ec473974a602806f7f28b4e4f4ba8913474e9a00.zip
edk2-ec473974a602806f7f28b4e4f4ba8913474e9a00.tar.gz
edk2-ec473974a602806f7f28b4e4f4ba8913474e9a00.tar.bz2
sync patch r11316 from main trunk.
Per PI spec, StatusCode related structure is not required to be defined as packed byte. So, StatusCode related structures are updated from packed to unpacked. Notes: 1. This patch is an incompatible change for the binary image built based on previous EDKII code. But, it is a compatible change for source. 2. This change will make StatusCode related definition in MdePkg to align the one defined in EcpPkg. Then, EDK driver based on EcpPkg can work together EDKII core. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010@11529 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--MdePkg/Include/Guid/StatusCodeDataTypeId.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/MdePkg/Include/Guid/StatusCodeDataTypeId.h b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
index b550764..dbe7662 100644
--- a/MdePkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
@@ -1,8 +1,8 @@
/** @file
GUID used to identify id for the caller who is initiating the Status Code.
- Copyright (c) 2006, Intel Corporation
- All rights reserved. This program and the accompanying materials
+ Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
@@ -27,9 +27,7 @@
///
#define EFI_STATUS_CODE_DATA_TYPE_STRING_GUID \
{ 0x92D11080, 0x496F, 0x4D95, { 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A } }
-
-#pragma pack(1)
-
+
typedef enum {
///
/// A NULL-terminated ASCII string.
@@ -104,8 +102,6 @@ typedef struct {
EFI_STATUS_CODE_STRING String;
} EFI_STATUS_CODE_STRING_DATA;
-#pragma pack()
-
extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;
///
@@ -126,8 +122,6 @@ extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;
#define EFI_STATUS_CODE_SPECIFIC_DATA_GUID \
{ 0x335984bd, 0xe805, 0x409a, { 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6 } }
-#pragma pack(1)
-
///
/// Extended data about the device path, which is used for many errors and
/// progress codes to point to the device.
@@ -778,8 +772,6 @@ typedef struct {
EFI_PHYSICAL_ADDRESS RomImageBase;
} EFI_LEGACY_OPROM_EXTENDED_DATA;
-#pragma pack()
-
extern EFI_GUID gEfiStatusCodeSpecificDataGuid;
#endif