tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/AcpiPlatformDxe: Fix Visual Studio build issues 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13634 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jljusten 2012-08-15 00:03:35 +00:00
parent e148512e51
commit ff8dd312dd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OvmfPkg/AcpiPlatformDxe/Qemu.c
View File

@ -100,8 +100,8 @@ QemuInstallAcpiMadtTable (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
Madt->Header = *(EFI_ACPI_DESCRIPTION_HEADER *) AcpiTableBuffer; CopyMem (&(Madt->Header), AcpiTableBuffer, sizeof (EFI_ACPI_DESCRIPTION_HEADER));
Madt->Header.Length = NewBufferSize; Madt->Header.Length = (UINT32) NewBufferSize;
Madt->LocalApicAddress = PcdGet32 (PcdCpuLocalApicBaseAddress); Madt->LocalApicAddress = PcdGet32 (PcdCpuLocalApicBaseAddress);
Madt->Flags = EFI_ACPI_1_0_PCAT_COMPAT; Madt->Flags = EFI_ACPI_1_0_PCAT_COMPAT;
Ptr = Madt + 1; Ptr = Madt + 1;
@ -110,8 +110,8 @@ QemuInstallAcpiMadtTable (
for (Loop = 0; Loop < CpuCount; ++Loop) { for (Loop = 0; Loop < CpuCount; ++Loop) {
LocalApic->Type = EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC; LocalApic->Type = EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC;
LocalApic->Length = sizeof (*LocalApic); LocalApic->Length = sizeof (*LocalApic);
LocalApic->AcpiProcessorId = Loop; LocalApic->AcpiProcessorId = (UINT8) Loop;
LocalApic->ApicId = Loop; LocalApic->ApicId = (UINT8) Loop;
LocalApic->Flags = 1; // enabled LocalApic->Flags = 1; // enabled
++LocalApic; ++LocalApic;
} }
@ -120,7 +120,7 @@ QemuInstallAcpiMadtTable (
IoApic = Ptr; IoApic = Ptr;
IoApic->Type = EFI_ACPI_1_0_IO_APIC; IoApic->Type = EFI_ACPI_1_0_IO_APIC;
IoApic->Length = sizeof (*IoApic); IoApic->Length = sizeof (*IoApic);
IoApic->IoApicId = CpuCount; IoApic->IoApicId = (UINT8) CpuCount;
IoApic->Reserved = EFI_ACPI_RESERVED_BYTE; IoApic->Reserved = EFI_ACPI_RESERVED_BYTE;
IoApic->IoApicAddress = 0xFEC00000; IoApic->IoApicAddress = 0xFEC00000;
IoApic->SystemVectorBase = 0x00000000; IoApic->SystemVectorBase = 0x00000000;
@ -148,13 +148,13 @@ QemuInstallAcpiMadtTable (
Iso->Type = EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE; Iso->Type = EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE;
Iso->Length = sizeof (*Iso); Iso->Length = sizeof (*Iso);
Iso->Bus = 0x00; // ISA Iso->Bus = 0x00; // ISA
Iso->Source = Loop; Iso->Source = (UINT8) Loop;
Iso->GlobalSystemInterruptVector = Loop; Iso->GlobalSystemInterruptVector = (UINT32) Loop;
Iso->Flags = 0x000D; // Level-tiggered, Active High Iso->Flags = 0x000D; // Level-tiggered, Active High
++Iso; ++Iso;
} }
ASSERT ( ASSERT (
Iso - (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)Ptr == (UINTN) (Iso - (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)Ptr) ==
1 + PciLinkIsoCount 1 + PciLinkIsoCount
); );
Ptr = Iso; Ptr = Iso;
@ -174,7 +174,7 @@ QemuInstallAcpiMadtTable (
LocalApicNmi->LocalApicInti = 0x01; LocalApicNmi->LocalApicInti = 0x01;
Ptr = LocalApicNmi + 1; Ptr = LocalApicNmi + 1;
ASSERT ((UINT8 *)Ptr - (UINT8 *)Madt == NewBufferSize); ASSERT ((UINTN) ((UINT8 *)Ptr - (UINT8 *)Madt) == NewBufferSize);
Status = InstallAcpiTable (AcpiProtocol, Madt, NewBufferSize, TableKey); Status = InstallAcpiTable (AcpiProtocol, Madt, NewBufferSize, TableKey);
FreePool (Madt); FreePool (Madt);