From 02317fc34f941844353e80594cfd1103be9334f3 Mon Sep 17 00:00:00 2001 From: ydong10 Date: Wed, 14 Sep 2011 09:55:31 +0000 Subject: Remove useless pointer check. Signed-of-by: ydong10 Reviewed-by: vanjeff Reviewed-by: rsun3 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12348 6f19259b-4bc3-4df7-8a09-765794883524 --- .../AcpiSupportAcpiSupportProtocol.c | 122 ++++++++++----------- 1 file changed, 60 insertions(+), 62 deletions(-) (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c index 6c9cb740a9..f919911ffd 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c @@ -789,73 +789,71 @@ AddTableToList ( // // Update pointers in FADT. If tables don't exist this will put NULL pointers there. // - if (AcpiSupportInstance->Fadt3 != NULL) { - AcpiSupportInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN) AcpiSupportInstance->Facs3; - Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Facs3; - CopyMem ( - &AcpiSupportInstance->Fadt3->XFirmwareCtrl, - &Buffer64, - sizeof (UINT64) - ); - AcpiSupportInstance->Fadt3->Dsdt = (UINT32) (UINTN) AcpiSupportInstance->Dsdt3; - Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Dsdt3; - CopyMem ( - &AcpiSupportInstance->Fadt3->XDsdt, - &Buffer64, - sizeof (UINT64) - ); - - // - // RSDP OEM information is updated to match the FADT OEM information - // - CopyMem ( - &AcpiSupportInstance->Rsdp3->OemId, - &AcpiSupportInstance->Fadt3->Header.OemId, - 6 - ); + AcpiSupportInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN) AcpiSupportInstance->Facs3; + Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Facs3; + CopyMem ( + &AcpiSupportInstance->Fadt3->XFirmwareCtrl, + &Buffer64, + sizeof (UINT64) + ); + AcpiSupportInstance->Fadt3->Dsdt = (UINT32) (UINTN) AcpiSupportInstance->Dsdt3; + Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Dsdt3; + CopyMem ( + &AcpiSupportInstance->Fadt3->XDsdt, + &Buffer64, + sizeof (UINT64) + ); - // - // RSDT OEM information is updated to match FADT OEM information. - // - CopyMem ( - &AcpiSupportInstance->Rsdt3->OemId, - &AcpiSupportInstance->Fadt3->Header.OemId, - 6 - ); - CopyMem ( - &AcpiSupportInstance->Rsdt3->OemTableId, - &AcpiSupportInstance->Fadt3->Header.OemTableId, - sizeof (UINT64) - ); - AcpiSupportInstance->Rsdt3->OemRevision = AcpiSupportInstance->Fadt3->Header.OemRevision; + // + // RSDP OEM information is updated to match the FADT OEM information + // + CopyMem ( + &AcpiSupportInstance->Rsdp3->OemId, + &AcpiSupportInstance->Fadt3->Header.OemId, + 6 + ); - // - // XSDT OEM information is updated to match FADT OEM information. - // - CopyMem ( - &AcpiSupportInstance->Xsdt->OemId, - &AcpiSupportInstance->Fadt3->Header.OemId, - 6 - ); - CopyMem ( - &AcpiSupportInstance->Xsdt->OemTableId, - &AcpiSupportInstance->Fadt3->Header.OemTableId, - sizeof (UINT64) - ); - AcpiSupportInstance->Xsdt->OemRevision = AcpiSupportInstance->Fadt3->Header.OemRevision; - } + // + // RSDT OEM information is updated to match FADT OEM information. + // + CopyMem ( + &AcpiSupportInstance->Rsdt3->OemId, + &AcpiSupportInstance->Fadt3->Header.OemId, + 6 + ); + CopyMem ( + &AcpiSupportInstance->Rsdt3->OemTableId, + &AcpiSupportInstance->Fadt3->Header.OemTableId, + sizeof (UINT64) + ); + AcpiSupportInstance->Rsdt3->OemRevision = AcpiSupportInstance->Fadt3->Header.OemRevision; // - // Checksum the table + // XSDT OEM information is updated to match FADT OEM information. // - if (Checksum) { - AcpiPlatformChecksum ( - CurrentTableList->Table, - CurrentTableList->Table->Length, - OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER, - Checksum) - ); - } + CopyMem ( + &AcpiSupportInstance->Xsdt->OemId, + &AcpiSupportInstance->Fadt3->Header.OemId, + 6 + ); + CopyMem ( + &AcpiSupportInstance->Xsdt->OemTableId, + &AcpiSupportInstance->Fadt3->Header.OemTableId, + sizeof (UINT64) + ); + AcpiSupportInstance->Xsdt->OemRevision = AcpiSupportInstance->Fadt3->Header.OemRevision; + } + + // + // Checksum the table + // + if (Checksum) { + AcpiPlatformChecksum ( + CurrentTableList->Table, + CurrentTableList->Table->Length, + OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER, + Checksum) + ); } break; -- cgit v1.2.3