From a25caa524e86e3de45b577c195841c3f43beb649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20H=C3=A4user?= Date: Tue, 27 Feb 2018 23:24:46 +0100 Subject: MinPlatformPkg/TestPointCheckLib: Remove unused variables. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marvin Haeuser Reviewed-by: Jiewen Yao --- .../Library/TestPointCheckLib/DxeCheckAcpiMadt.c | 34 ++++++++++++---------- .../TestPointCheckLib/DxeCheckMemoryAttribute.c | 12 ++------ 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c index ec63e2d7f9..92032d5712 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c @@ -254,17 +254,19 @@ CheckAcpiMadt ( APIC_STRUCT_HEADER *ApicStructHeader; INTN MadtLen; - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApic; EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic; + EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressOverride; + EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic; +#if 0 + EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApic; EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOverride; EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterruptSource; EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressOverride; - EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic; EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSapic; EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterruptSource; EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2Apic; EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; +#endif if (!IsMmioExit (Madt->LocalApicAddress, SIZE_4KB, TRUE)) { DEBUG ((DEBUG_ERROR, "MADT resource (0x%x) is not reported correctly.\n", Madt->LocalApicAddress)); @@ -278,9 +280,6 @@ CheckAcpiMadt ( ApicStructHeader = (APIC_STRUCT_HEADER *)(Madt + 1); while (MadtLen > 0) { switch (ApicStructHeader->Type) { - case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC: - ProcessorLocalApic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *)ApicStructHeader; - break; case EFI_ACPI_4_0_IO_APIC: IOApic = (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader; if (!IsMmioExit (IOApic->IoApicAddress, SIZE_4KB, TRUE)) { @@ -288,15 +287,6 @@ CheckAcpiMadt ( return EFI_NOT_STARTED; } break; - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE: - InterruptSourceOverride = (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)ApicStructHeader; - break; - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE: - NonMaskableInterruptSource = (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *)ApicStructHeader; - break; - case EFI_ACPI_4_0_LOCAL_APIC_NMI: - LocalApicNMI = (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStructHeader; - break; case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE: LocalApicAddressOverride = (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *)ApicStructHeader; if (!IsMmioExit (LocalApicAddressOverride->LocalApicAddress, SIZE_4KB, TRUE)) { @@ -311,6 +301,19 @@ CheckAcpiMadt ( return EFI_NOT_STARTED; } break; +#if 0 + case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC: + ProcessorLocalApic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *)ApicStructHeader; + break; + case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE: + InterruptSourceOverride = (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)ApicStructHeader; + break; + case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE: + NonMaskableInterruptSource = (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *)ApicStructHeader; + break; + case EFI_ACPI_4_0_LOCAL_APIC_NMI: + LocalApicNMI = (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStructHeader; + break; case EFI_ACPI_4_0_LOCAL_SAPIC: ProcessorLocalSapic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)ApicStructHeader; break; @@ -323,6 +326,7 @@ CheckAcpiMadt ( case EFI_ACPI_4_0_LOCAL_X2APIC_NMI: LocalX2ApicNmi = (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *)ApicStructHeader; break; +#endif default: break; } diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c index f92a8d7f75..f222019e72 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c @@ -139,10 +139,8 @@ TestPointCheckImageMemoryAttribute ( EFI_IMAGE_DOS_HEADER *DosHdr; UINT32 PeCoffHeaderOffset; UINT32 SectionAlignment; - UINT16 ImageType; EFI_IMAGE_SECTION_HEADER *Section; EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr; - UINT16 Magic; UINT8 *Name; UINTN Index; CHAR8 *PdbPointer; @@ -180,19 +178,13 @@ TestPointCheckImageMemoryAttribute ( if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) { // // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value - // in the PE/COFF Header. If the MachineType is Itanium(IA64) and the - // Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC - // then override the magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC + // in the PE/COFF Header. // - Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC; - ImageType = Hdr.Pe32->OptionalHeader.Subsystem; SectionAlignment = Hdr.Pe32->OptionalHeader.SectionAlignment; } else { // - // Get the magic value from the PE/COFF Optional Header + // Get the section alignment value from the PE/COFF Optional Header // - Magic = Hdr.Pe32->OptionalHeader.Magic; - ImageType = Hdr.Pe32Plus->OptionalHeader.Subsystem; SectionAlignment = Hdr.Pe32Plus->OptionalHeader.SectionAlignment; } -- cgit v1.2.3