mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-31 01:24:12 +02:00
ArmPlatformPkg/ArmJunoDxe: simplify ACPI table installation
Having a three way conditional with callbacks would make sense if the callbacks weren't (a) identical and (b) didn't return TRUE all the time. So get rid of the kludge. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Tested-by: Ryan Harkin <ryan.harkin@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
parent
6e9e524f9b
commit
bacfa806a7
@ -400,34 +400,6 @@ OnEndOfDxe (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC
|
|
||||||
BOOLEAN
|
|
||||||
AcpiTableJunoR0Check (
|
|
||||||
IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC
|
|
||||||
BOOLEAN
|
|
||||||
AcpiTableJunoR1Check (
|
|
||||||
IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC
|
|
||||||
BOOLEAN
|
|
||||||
AcpiTableJunoR2Check (
|
|
||||||
IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
ArmJunoEntryPoint (
|
ArmJunoEntryPoint (
|
||||||
@ -517,14 +489,7 @@ ArmJunoEntryPoint (
|
|||||||
//
|
//
|
||||||
// Try to install the ACPI Tables
|
// Try to install the ACPI Tables
|
||||||
//
|
//
|
||||||
if (JunoRevision == JUNO_REVISION_R0) {
|
Status = LocateAndInstallAcpiFromFv (&mJunoAcpiTableFile);
|
||||||
Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR0Check);
|
|
||||||
} else if (JunoRevision == JUNO_REVISION_R1) {
|
|
||||||
Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR1Check);
|
|
||||||
} else if (JunoRevision == JUNO_REVISION_R2) {
|
|
||||||
Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR2Check);
|
|
||||||
}
|
|
||||||
|
|
||||||
ASSERT_EFI_ERROR (Status);
|
ASSERT_EFI_ERROR (Status);
|
||||||
|
|
||||||
//
|
//
|
||||||
|
Loading…
x
Reference in New Issue
Block a user