Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure
*** 3,13 ****
* Module Name: tbxfroot - Find the root ACPI table (RSDT)
*
*****************************************************************************/
/*
! * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
--- 3,13 ----
* Module Name: tbxfroot - Find the root ACPI table (RSDT)
*
*****************************************************************************/
/*
! * Copyright (C) 2000 - 2014, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*** 49,70 ****
#define _COMPONENT ACPI_TABLES
ACPI_MODULE_NAME ("tbxfroot")
- /* Local prototypes */
- static UINT8 *
- AcpiTbScanMemoryForRsdp (
- UINT8 *StartAddress,
- UINT32 Length);
-
- static ACPI_STATUS
- AcpiTbValidateRsdp (
- ACPI_TABLE_RSDP *Rsdp);
-
-
/*******************************************************************************
*
* FUNCTION: AcpiTbValidateRsdp
*
* PARAMETERS: Rsdp - Pointer to unvalidated RSDP
--- 49,59 ----
*** 73,97 ****
*
* DESCRIPTION: Validate the RSDP (ptr)
*
******************************************************************************/
! static ACPI_STATUS
AcpiTbValidateRsdp (
ACPI_TABLE_RSDP *Rsdp)
{
- ACPI_FUNCTION_ENTRY ();
-
/*
* The signature and checksum must both be correct
*
* Note: Sometimes there exists more than one RSDP in memory; the valid
* RSDP has a valid checksum, all others have an invalid checksum.
*/
! if (ACPI_STRNCMP ((char *) Rsdp, ACPI_SIG_RSDP,
! sizeof (ACPI_SIG_RSDP)-1) != 0)
{
/* Nope, BAD Signature */
return (AE_BAD_SIGNATURE);
}
--- 62,83 ----
*
* DESCRIPTION: Validate the RSDP (ptr)
*
******************************************************************************/
! ACPI_STATUS
AcpiTbValidateRsdp (
ACPI_TABLE_RSDP *Rsdp)
{
/*
* The signature and checksum must both be correct
*
* Note: Sometimes there exists more than one RSDP in memory; the valid
* RSDP has a valid checksum, all others have an invalid checksum.
*/
! if (!ACPI_VALIDATE_RSDP_SIG (Rsdp->Signature))
{
/* Nope, BAD Signature */
return (AE_BAD_SIGNATURE);
}
*** 232,242 ****
return_ACPI_STATUS (AE_OK);
}
/* A valid RSDP was not found */
! ACPI_ERROR ((AE_INFO, "A valid RSDP was not found"));
return_ACPI_STATUS (AE_NOT_FOUND);
}
ACPI_EXPORT_SYMBOL (AcpiFindRootPointer)
--- 218,228 ----
return_ACPI_STATUS (AE_OK);
}
/* A valid RSDP was not found */
! ACPI_BIOS_ERROR ((AE_INFO, "A valid RSDP was not found"));
return_ACPI_STATUS (AE_NOT_FOUND);
}
ACPI_EXPORT_SYMBOL (AcpiFindRootPointer)
*** 252,262 ****
*
* DESCRIPTION: Search a block of memory for the RSDP signature
*
******************************************************************************/
! static UINT8 *
AcpiTbScanMemoryForRsdp (
UINT8 *StartAddress,
UINT32 Length)
{
ACPI_STATUS Status;
--- 238,248 ----
*
* DESCRIPTION: Search a block of memory for the RSDP signature
*
******************************************************************************/
! UINT8 *
AcpiTbScanMemoryForRsdp (
UINT8 *StartAddress,
UINT32 Length)
{
ACPI_STATUS Status;
*** 294,299 ****
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"Searched entire block from %p, valid RSDP was not found\n",
StartAddress));
return_PTR (NULL);
}
-
--- 280,284 ----