git: 5723d13811db - main - acpica: Fix the botched merge
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Oct 2022 02:39:59 UTC
The branch main has been updated by jkim:
URL: https://cgit.FreeBSD.org/src/commit/?id=5723d13811dbecd3277d919bb1f259d52b890717
commit 5723d13811dbecd3277d919bb1f259d52b890717
Author: Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2022-10-28 02:36:35 +0000
Commit: Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2022-10-28 02:36:35 +0000
acpica: Fix the botched merge
Fixes: 9a4bc5208fad acpica: Import ACPICA 20221020
---
sys/contrib/dev/acpica/compiler/aslprune.c | 8 -
.../dev/acpica/components/debugger/dbutils.c | 192 ---------------------
2 files changed, 200 deletions(-)
diff --git a/sys/contrib/dev/acpica/compiler/aslprune.c b/sys/contrib/dev/acpica/compiler/aslprune.c
index a4e817e9ceb5..646aab2918e5 100644
--- a/sys/contrib/dev/acpica/compiler/aslprune.c
+++ b/sys/contrib/dev/acpica/compiler/aslprune.c
@@ -166,17 +166,9 @@ PrTreePruneWalk (
void *Context);
static void
-<<<<<<< HEAD:sys/contrib/dev/acpica/compiler/aslprune.c
PrPrintObjectAtLevel (
UINT32 Level,
const char *ObjectName);
-=======
-AhDisplayUsage (
- void);
-
-#define AH_UTILITY_NAME "ACPI Help Utility"
-#define AH_SUPPORTED_OPTIONS "adeghikmopstuv^x"
->>>>>>> a799bdd9d50e (Import ACPICA 20221020):source/tools/acpihelp/ahmain.c
/* Structure used for the pruning parse tree walk */
diff --git a/sys/contrib/dev/acpica/components/debugger/dbutils.c b/sys/contrib/dev/acpica/components/debugger/dbutils.c
index 6e3a2b107ad9..a98a3a61eeb9 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbutils.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbutils.c
@@ -190,198 +190,6 @@ AcpiDbMatchArgument (
char *UserArgument,
ACPI_DB_ARGUMENT_INFO *Arguments)
{
-<<<<<<< HEAD:sys/contrib/dev/acpica/components/debugger/dbutils.c
-=======
-
- if (!ACPI_VALIDATE_RSDP_SIG (Table->Signature))
- {
- /* Make sure signature is all ASCII and a valid ACPI name */
-
- if (!AcpiUtValidNameseg (Table->Signature))
- {
- fprintf (stderr, "Table signature (0x%8.8X) is invalid\n",
- *(UINT32 *) Table->Signature);
- return (FALSE);
- }
-
- /* Check for minimum table length */
-
- if (Table->Length < sizeof (ACPI_TABLE_HEADER))
- {
- fprintf (stderr, "Table length (0x%8.8X) is invalid\n",
- Table->Length);
- return (FALSE);
- }
- }
-
- return (TRUE);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: ApIsValidChecksum
- *
- * PARAMETERS: Table - Pointer to table to be validated
- *
- * RETURN: TRUE if the checksum appears to be valid. FALSE otherwise.
- *
- * DESCRIPTION: Check for a valid ACPI table checksum.
- *
- ******************************************************************************/
-
-BOOLEAN
-ApIsValidChecksum (
- ACPI_TABLE_HEADER *Table)
-{
- ACPI_STATUS Status;
- ACPI_TABLE_RSDP *Rsdp;
-
-
- if (ACPI_VALIDATE_RSDP_SIG (Table->Signature))
- {
- /*
- * Checksum for RSDP.
- * Note: Other checksums are computed during the table dump.
- */
- Rsdp = ACPI_CAST_PTR (ACPI_TABLE_RSDP, Table);
- Status = AcpiTbValidateRsdp (Rsdp);
- }
- else
- {
- /* 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))
- {
- fprintf (stderr, "%4.4s: Warning: wrong checksum in table\n",
- Table->Signature);
- }
-
- return (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: ApGetTableLength
- *
- * PARAMETERS: Table - Pointer to the table
- *
- * RETURN: Table length
- *
- * DESCRIPTION: Obtain table length according to table signature.
- *
- ******************************************************************************/
-
-UINT32
-ApGetTableLength (
- ACPI_TABLE_HEADER *Table)
-{
- ACPI_TABLE_RSDP *Rsdp;
-
-
- /* Check if table is valid */
-
- if (!ApIsValidHeader (Table))
- {
- return (0);
- }
-
- if (ACPI_VALIDATE_RSDP_SIG (Table->Signature))
- {
- Rsdp = ACPI_CAST_PTR (ACPI_TABLE_RSDP, Table);
- return (AcpiTbGetRsdpLength (Rsdp));
- }
-
- /* Normal ACPI table */
-
- return (Table->Length);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: ApDumpTableBuffer
- *
- * PARAMETERS: Table - ACPI table to be dumped
- * Instance - ACPI table instance no. to be dumped
- * Address - Physical address of the table
- *
- * RETURN: None
- *
- * DESCRIPTION: Dump an ACPI table in standard ASCII hex format, with a
- * header that is compatible with the AcpiXtract utility.
- *
- ******************************************************************************/
-
-static int
-ApDumpTableBuffer (
- ACPI_TABLE_HEADER *Table,
- UINT32 Instance,
- ACPI_PHYSICAL_ADDRESS Address)
-{
- UINT32 TableLength;
-
-
- TableLength = ApGetTableLength (Table);
-
- /* Print only the header if requested */
-
- if (Gbl_SummaryMode)
- {
- AcpiTbPrintTableHeader (Address, Table);
- return (0);
- }
-
- /* Dump to binary file if requested */
-
- if (Gbl_BinaryMode)
- {
- return (ApWriteToBinaryFile (Table, Instance));
- }
-
- /*
- * Dump the table with header for use with acpixtract utility.
- * Note: simplest to just always emit a 64-bit address. AcpiXtract
- * utility can handle this.
- */
- fprintf (Gbl_OutputFile, "%4.4s @ 0x%8.8X%8.8X\n",
- Table->Signature, ACPI_FORMAT_UINT64 (Address));
-
- AcpiUtDumpBufferToFile (Gbl_OutputFile,
- ACPI_CAST_PTR (UINT8, Table), TableLength,
- DB_BYTE_DISPLAY, 0);
- fprintf (Gbl_OutputFile, "\n");
- return (0);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: ApDumpAllTables
- *
- * PARAMETERS: None
- *
- * RETURN: Status
- *
- * DESCRIPTION: Get all tables from the RSDT/XSDT (or at least all of the
- * tables that we can possibly get).
- *
- ******************************************************************************/
-
-int
-ApDumpAllTables (
- void)
-{
- ACPI_TABLE_HEADER *Table;
- UINT32 Instance = 0;
- ACPI_PHYSICAL_ADDRESS Address;
- ACPI_STATUS Status;
- int TableStatus;
->>>>>>> a799bdd9d50e (Import ACPICA 20221020):source/tools/acpidump/apdump.c
UINT32 i;