diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-07-26 18:20:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-07-26 18:20:00 +0000 |
| commit | dbded195f9840f9044a6828c8877c6bf0a956482 (patch) | |
| tree | e05da15a04629f6e36af5ca6c81a2efda47a9dc3 /source/components/tables | |
| parent | 94c37fb2483cc09856a30e74879a69f2ccfe22f0 (diff) | |
Import ACPICA 20130725.vendor/acpica/20130725
Notes
svn path=/vendor-sys/acpica/dist/; revision=253681
svn path=/vendor-sys/acpica/20130725/; revision=253682; tag=vendor/acpica/20130725
Diffstat (limited to 'source/components/tables')
| -rw-r--r-- | source/components/tables/tbfadt.c | 4 | ||||
| -rw-r--r-- | source/components/tables/tbxfroot.c | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/source/components/tables/tbfadt.c b/source/components/tables/tbfadt.c index 6f41c46321e4..eb4e0e5695d5 100644 --- a/source/components/tables/tbfadt.c +++ b/source/components/tables/tbfadt.c @@ -132,7 +132,7 @@ static ACPI_FADT_INFO FadtInfoTable[] = ACPI_FADT_OFFSET (PmTimerBlock), ACPI_FADT_OFFSET (PmTimerLength), ACPI_PM_TIMER_WIDTH, - ACPI_FADT_REQUIRED}, + ACPI_FADT_SEPARATE_LENGTH}, /* ACPI 5.0A: Timer is optional */ {"Gpe0Block", ACPI_FADT_OFFSET (XGpe0Block), @@ -606,7 +606,7 @@ AcpiTbValidateFadt ( if (FadtInfoTable[i].Type & ACPI_FADT_REQUIRED) { /* - * Field is required (PM1aEvent, PM1aControl, PmTimer). + * Field is required (PM1aEvent, PM1aControl). * Both the address and length must be non-zero. */ if (!Address64->Address || !Length) diff --git a/source/components/tables/tbxfroot.c b/source/components/tables/tbxfroot.c index 20cc0fa6c85b..fa67781cb14f 100644 --- a/source/components/tables/tbxfroot.c +++ b/source/components/tables/tbxfroot.c @@ -51,12 +51,6 @@ #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbxfroot") -/* Local prototypes */ - -static ACPI_STATUS -AcpiTbValidateRsdp ( - ACPI_TABLE_RSDP *Rsdp); - /******************************************************************************* * @@ -70,7 +64,7 @@ AcpiTbValidateRsdp ( * ******************************************************************************/ -static ACPI_STATUS +ACPI_STATUS AcpiTbValidateRsdp ( ACPI_TABLE_RSDP *Rsdp) { @@ -81,7 +75,7 @@ AcpiTbValidateRsdp ( * 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, + if (ACPI_STRNCMP ((char *) Rsdp->Signature, ACPI_SIG_RSDP, sizeof (ACPI_SIG_RSDP)-1) != 0) { /* Nope, BAD Signature */ |