From 26af9aca92e11b77dbb9cf942d9dae92a71bfbbd Mon Sep 17 00:00:00 2001 From: jljusten Date: Thu, 9 Aug 2012 23:27:05 +0000 Subject: [PATCH 1/1] OvmfPkg/AcpiPlatformDxe: Fix Visual Studio build issues Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13602 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/AcpiPlatformDxe/Qemu.c | 4 ++-- OvmfPkg/AcpiPlatformDxe/Xen.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c index 051449d72a..4c88c32ec8 100644 --- a/OvmfPkg/AcpiPlatformDxe/Qemu.c +++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c @@ -268,8 +268,8 @@ QemuInstallAcpiSsdtTable ( *(UINT32*) SsdtPtr = sizeof (*FwData); SsdtPtr += 4; - ASSERT(SsdtPtr - Ssdt == SsdtSize); - ((EFI_ACPI_DESCRIPTION_HEADER *) Ssdt)->Length = SsdtSize; + ASSERT((UINTN) (SsdtPtr - Ssdt) == SsdtSize); + ((EFI_ACPI_DESCRIPTION_HEADER *) Ssdt)->Length = (UINT32) SsdtSize; Status = InstallAcpiTable (AcpiProtocol, Ssdt, SsdtSize, TableKey); } diff --git a/OvmfPkg/AcpiPlatformDxe/Xen.c b/OvmfPkg/AcpiPlatformDxe/Xen.c index 02ab8402eb..618ac58b42 100644 --- a/OvmfPkg/AcpiPlatformDxe/Xen.c +++ b/OvmfPkg/AcpiPlatformDxe/Xen.c @@ -188,7 +188,7 @@ InstallXenTables ( CurrentTableEntry = (VOID *) ((UINT8 *) Xsdt + sizeof (EFI_ACPI_DESCRIPTION_HEADER) + Index * sizeof (UINT64)); - CurrentTablePointer = *(UINT64 *)CurrentTableEntry; + CurrentTablePointer = (UINTN) *(UINT64 *)CurrentTableEntry; CurrentTable = (EFI_ACPI_DESCRIPTION_HEADER *) CurrentTablePointer; // -- 2.39.2