diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2022-10-27 21:34:40 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2022-10-27 21:34:40 +0000 |
| commit | a799bdd9d50e84cd6a36e8f1d2ac4301b2a6b374 (patch) | |
| tree | 475474e13a28c050113fa83feb0f96c0049cfcc5 /source/tools | |
| parent | ca1c95cc699a25d891e62ef863c8268c93b35cf8 (diff) | |
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/acpidump/apdump.c | 4 | ||||
| -rw-r--r-- | source/tools/acpiexec/aetables.c | 10 | ||||
| -rw-r--r-- | source/tools/acpihelp/ahmain.c | 2 | ||||
| -rw-r--r-- | source/tools/acpisrc/astable.c | 4 | ||||
| -rw-r--r-- | source/tools/acpixtract/acpixtract.c | 2 | ||||
| -rw-r--r-- | source/tools/examples/extables.c | 8 |
6 files changed, 15 insertions, 15 deletions
diff --git a/source/tools/acpidump/apdump.c b/source/tools/acpidump/apdump.c index d66832d1a4e9..0cf8d00ab8de 100644 --- a/source/tools/acpidump/apdump.c +++ b/source/tools/acpidump/apdump.c @@ -234,7 +234,9 @@ ApIsValidChecksum ( } else { - Status = AcpiTbVerifyChecksum (Table, Table->Length); + /* We don't have to check for a CDAT here, since CDAT is not in the RSDT/XSDT */ + + Status = AcpiUtVerifyChecksum (Table, Table->Length); } if (ACPI_FAILURE (Status)) diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c index 97f4fb73a8ae..c758084ce583 100644 --- a/source/tools/acpiexec/aetables.c +++ b/source/tools/acpiexec/aetables.c @@ -267,7 +267,7 @@ AeInitializeTableHeader ( /* Set the checksum, must set to zero first */ Header->Checksum = 0; - Header->Checksum = (UINT8) -AcpiTbChecksum ( + Header->Checksum = (UINT8) -AcpiUtChecksum ( (void *) Header, Header->Length); } @@ -420,7 +420,7 @@ AeBuildLocalTables ( AeInitializeTableHeader ((void *) LocalXSDT, ACPI_SIG_XSDT, XsdtSize); LocalRSDP.Checksum = 0; - LocalRSDP.Checksum = (UINT8) -AcpiTbChecksum ( + LocalRSDP.Checksum = (UINT8) -AcpiUtChecksum ( (void *) &LocalRSDP, ACPI_RSDP_CHECKSUM_LENGTH); if (!DsdtAddress) @@ -471,7 +471,7 @@ AeBuildLocalTables ( /* Complete the external FADT with the checksum */ ExternalFadt->Header.Checksum = 0; - ExternalFadt->Header.Checksum = (UINT8) -AcpiTbChecksum ( + ExternalFadt->Header.Checksum = (UINT8) -AcpiUtChecksum ( (void *) ExternalFadt, ExternalFadt->Header.Length); } else if (AcpiGbl_UseHwReducedFadt) @@ -551,7 +551,7 @@ AeBuildLocalTables ( LocalTEST.Length = sizeof (ACPI_TABLE_HEADER); LocalTEST.Checksum = 0; - LocalTEST.Checksum = (UINT8) -AcpiTbChecksum ( + LocalTEST.Checksum = (UINT8) -AcpiUtChecksum ( (void *) &LocalTEST, LocalTEST.Length); /* @@ -565,7 +565,7 @@ AeBuildLocalTables ( LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER); LocalBADTABLE.Checksum = 0; - LocalBADTABLE.Checksum = (UINT8) -AcpiTbChecksum ( + LocalBADTABLE.Checksum = (UINT8) -AcpiUtChecksum ( (void *) &LocalBADTABLE, LocalBADTABLE.Length); } diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c index 808a8edafbbc..6570cbc66508 100644 --- a/source/tools/acpihelp/ahmain.c +++ b/source/tools/acpihelp/ahmain.c @@ -160,7 +160,7 @@ AhDisplayUsage ( void); #define AH_UTILITY_NAME "ACPI Help Utility" -#define AH_SUPPORTED_OPTIONS "adeghikmopstuvx^" +#define AH_SUPPORTED_OPTIONS "adeghikmopstuv^x" #if defined ACPI_OPTION diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c index ec4344776c24..d2da8e3011e6 100644 --- a/source/tools/acpisrc/astable.c +++ b/source/tools/acpisrc/astable.c @@ -648,12 +648,12 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_TABLE_BERT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_BGRT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_BOOT", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_CCEL", SRC_TYPE_STRUCT}, {"ACPI_TABLE_CEDT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_CPEP", SRC_TYPE_STRUCT}, {"ACPI_TABLE_CSRT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DBG2", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DBGP", SRC_TYPE_STRUCT}, - {"ACPI_TABLE_CEDT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DMAR", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DRTM", SRC_TYPE_STRUCT}, {"ACPI_TABLE_ECDT", SRC_TYPE_STRUCT}, @@ -686,7 +686,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_TABLE_RGRT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_RSDP", SRC_TYPE_STRUCT}, {"ACPI_TABLE_RSDT", SRC_TYPE_STRUCT}, - {"ACPI_TABLE_MCHI", SRC_TYPE_STRUCT}, {"ACPI_TABLE_S3PT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_SBST", SRC_TYPE_STRUCT}, {"ACPI_TABLE_SDEV", SRC_TYPE_STRUCT}, @@ -887,7 +886,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_PHAT_HEADER", SRC_TYPE_STRUCT}, {"ACPI_PHAT_VERSION_DATA", SRC_TYPE_STRUCT}, {"ACPI_PHAT_VERSION_ELEMENT", SRC_TYPE_STRUCT}, - {"ACPI_PHAT_VERSION_ELEMENT", SRC_TYPE_STRUCT}, {"ACPI_PHAT_HEALTH_DATA", SRC_TYPE_STRUCT}, {"ACPI_PMTT_CONTROLLER", SRC_TYPE_STRUCT}, {"ACPI_PMTT_HEADER", SRC_TYPE_STRUCT}, diff --git a/source/tools/acpixtract/acpixtract.c b/source/tools/acpixtract/acpixtract.c index 480e20e808b4..30bb06e5b531 100644 --- a/source/tools/acpixtract/acpixtract.c +++ b/source/tools/acpixtract/acpixtract.c @@ -561,7 +561,7 @@ AxListAllTables ( FILE *InputFile; unsigned char Header[48]; UINT32 ByteCount = 0; - UINT32 ThisLineByteCount; + INT32 ThisLineByteCount; unsigned int State = AX_STATE_FIND_HEADER; diff --git a/source/tools/examples/extables.c b/source/tools/examples/extables.c index 9f2bcc10838a..8633788ea821 100644 --- a/source/tools/examples/extables.c +++ b/source/tools/examples/extables.c @@ -315,19 +315,19 @@ ExInitializeAcpiTables ( /* Set new checksums for the modified tables */ Rsdp->Checksum = 0; - Rsdp->Checksum = (UINT8) -AcpiTbChecksum ( + Rsdp->Checksum = (UINT8) -AcpiUtChecksum ( (void *) RsdpCode, ACPI_RSDP_CHECKSUM_LENGTH); Rsdt->Header.Checksum = 0; - Rsdt->Header.Checksum = (UINT8) -AcpiTbChecksum ( + Rsdt->Header.Checksum = (UINT8) -AcpiUtChecksum ( (void *) Rsdt, Rsdt->Header.Length); Xsdt->Header.Checksum = 0; - Xsdt->Header.Checksum = (UINT8) -AcpiTbChecksum ( + Xsdt->Header.Checksum = (UINT8) -AcpiUtChecksum ( (void *) Xsdt, Xsdt->Header.Length); Fadt->Header.Checksum = 0; - Fadt->Header.Checksum = (UINT8) -AcpiTbChecksum ( + Fadt->Header.Checksum = (UINT8) -AcpiUtChecksum ( (void *) Fadt, Fadt->Header.Length); } |