summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-09-07 18:26:58 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-09-07 18:26:58 +0000
commit605466ae28482dd3d797e208fe80554f9814b175 (patch)
tree4ac12ace53d237ada2f1319b373ebac141c54765
parent3163461872ff6dbf67e8f9317d8608b40900f90c (diff)
downloadedk2-605466ae28482dd3d797e208fe80554f9814b175.zip
edk2-605466ae28482dd3d797e208fe80554f9814b175.tar.gz
edk2-605466ae28482dd3d797e208fe80554f9814b175.tar.bz2
ARM RVCT 3.1 compiler has issues with __packed structures containing anonymous structures in a union. I had to add extra PACKED macros to get things to compile. Hopefully at some point RVCT will support #pragma pack(1) properly and we can retire PACKED macro.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10856 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--MdePkg/Include/IndustryStandard/Acpi10.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/MdePkg/Include/IndustryStandard/Acpi10.h b/MdePkg/Include/IndustryStandard/Acpi10.h
index 591cbbb..fcc9146 100644
--- a/MdePkg/Include/IndustryStandard/Acpi10.h
+++ b/MdePkg/Include/IndustryStandard/Acpi10.h
@@ -87,19 +87,19 @@ typedef PACKED struct {
UINT64 AddrLen;
} EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR;
-typedef union {
+typedef PACKED union {
UINT8 Byte;
- struct {
+ PACKED struct {
UINT8 Length : 3;
UINT8 Name : 4;
UINT8 Type : 1;
} Bits;
} ACPI_SMALL_RESOURCE_HEADER;
-typedef struct {
- union {
+typedef PACKED struct {
+ PACKED union {
UINT8 Byte;
- struct{
+ PACKED struct {
UINT8 Name : 7;
UINT8 Type : 1;
}Bits;