diff options
| author | Michael Kinney <Michael.d.kinney@intel.com> | 2015-04-15 04:46:50 +0000 |
|---|---|---|
| committer | mdkinney <mdkinney@Edk2> | 2015-04-15 04:46:50 +0000 |
| commit | d3938cc8610b3e22b7ff299159ffb322a19ad952 (patch) | |
| tree | 46cc5317ed3785764e878abbbd2ed04bf7afc977 /MdePkg | |
| parent | 0a12cb77a57e717e1e1e80022ba369d799590bca (diff) | |
| download | edk2-d3938cc8610b3e22b7ff299159ffb322a19ad952.zip edk2-d3938cc8610b3e22b7ff299159ffb322a19ad952.tar.gz edk2-d3938cc8610b3e22b7ff299159ffb322a19ad952.tar.bz2 | |
ARM toolchain raised this compilation error when using the macro ACPI_DISPLAY_ADR().
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <Michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Tested-by: Olivier Martin <Olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17182 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg')
| -rw-r--r-- | MdePkg/Include/Protocol/DevicePath.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h index 7cf7113..a27ea5d 100644 --- a/MdePkg/Include/Protocol/DevicePath.h +++ b/MdePkg/Include/Protocol/DevicePath.h @@ -5,7 +5,7 @@ from a software point of view. The path must persist from boot to boot, so
it can not contain things like PCI bus numbers that change from boot to boot.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, 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 that accompanies this distribution.
The full text of the license may be found at
@@ -273,14 +273,14 @@ typedef struct { #define ACPI_ADR_DISPLAY_TYPE_INTERNAL_DIGITAL 4
#define ACPI_DISPLAY_ADR(_DeviceIdScheme, _HeadId, _NonVgaOutput, _BiosCanDetect, _VendorInfo, _Type, _Port, _Index) \
- ((UINT32)( (((_DeviceIdScheme) & 0x1) << 31) | \
- (((_HeadId) & 0x7) << 18) | \
- (((_NonVgaOutput) & 0x1) << 17) | \
- (((_BiosCanDetect) & 0x1) << 16) | \
- (((_VendorInfo) & 0xf) << 12) | \
- (((_Type) & 0xf) << 8) | \
- (((_Port) & 0xf) << 4) | \
- ((_Index) & 0xf) ))
+ ((UINT32)( ((UINT32)((_DeviceIdScheme) & 0x1) << 31) | \
+ (((_HeadId) & 0x7) << 18) | \
+ (((_NonVgaOutput) & 0x1) << 17) | \
+ (((_BiosCanDetect) & 0x1) << 16) | \
+ (((_VendorInfo) & 0xf) << 12) | \
+ (((_Type) & 0xf) << 8) | \
+ (((_Port) & 0xf) << 4) | \
+ ((_Index) & 0xf) ))
///
/// Messaging Device Paths.
|