From nobody Fri Oct 28 02:39:59 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mz6G74xHQz4grrw; Fri, 28 Oct 2022 02:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mz6G741d7z3pC8; Fri, 28 Oct 2022 02:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666924799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/IgbnADvkCp2sI09f5ePHmWAIR1mFc5BkrGslRGsld4=; b=ElGBs7s07EHitgMlvyVi3CYlKHXY+MqayHCe+HgsYfxxixaerNjPtvuQKbyI1faF22ag7F 32FQlbxaRJITyt+SwswYvPFOj118jnlWGEcjXJwQANlnDonGsvov+8pVo3g1kpD66UiKHh NRJmnyRuRqvfqk/L27c+29AJ+rgL9JncB0NJilzdRT08Zxd5ctXtIgDw8olX1iYeypEGjF RFzwNWCrKJfMiS9VEbwm6xBfTev9SqZNlYLdyKo68AUA1bpMqyCPznH4NT3VvfoA8Qj6Go sSDZnKkA94ebdap8htgJOf/ypyf2E37r3rKs+QI2+7v+2k/mppoAEc5GBdro/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mz6G72h76zM2j; Fri, 28 Oct 2022 02:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29S2dxiI053771; Fri, 28 Oct 2022 02:39:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29S2dxvo053770; Fri, 28 Oct 2022 02:39:59 GMT (envelope-from git) Date: Fri, 28 Oct 2022 02:39:59 GMT Message-Id: <202210280239.29S2dxvo053770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 5723d13811db - main - acpica: Fix the botched merge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5723d13811dbecd3277d919bb1f259d52b890717 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666924799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/IgbnADvkCp2sI09f5ePHmWAIR1mFc5BkrGslRGsld4=; b=ZopTcIKJbHkKE/qt3Mgd5Mhtb8mMD49+QQk5hvobyRi7gy0l6X5ZkEzbtV4BrP84ScJYkP Jhb95TmW9/1gcIRIrNJGrnJhQyYupYmFHiIGbGgBI/hGAN7MIt0h43taoTnPrsK38tUXp9 CDXY4EzirmKfR4nAIfonEa4EWHg9v1h9btcjblLpQLbjm6aomBJkqxWif47ORDaGL0MTJ6 bTfp7Xn1XbIm92WZ5etAxIgzGgHkNWbtiyAGbBkrM3lDgLGtiC8GYAkbYYGMTkClHeHp19 v89yTSIf+6XyrJJxZuUdns2d9Udgr9fvqDy/5wcXuCV7grm84IhPGY4Nr5TagA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666924799; a=rsa-sha256; cv=none; b=bwallYwg/iKlky2MmKelYDo9avRJ8wsgIZnRsKh5fQuIRjnbWkZx6FNCj1utp0dI9ZkIZY g/BPWVSTs4hpguRiXG5Xt05WYYUt8IBXWkv2V77SAJPBILoqQOs8u/fRMaeShFhpja8cSN xm42EsfCyFMXQ3NJvaUwinSYCxXzKiKSymkEYocDpvEyjlMQuACC4qOKBBzfuq1CMBoS92 +aNraugwYeQezjeaAJE5cmGnQbi76Hp4/YVDtQiHmzfY2w5Z0/R0U2KUUKNVA7shEFwPIq cVsppY/n9yy77MdBJ4YDAJcnB1acNKzE7/9ORlA2JBmt//AY7izE5auTPnHROw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=5723d13811dbecd3277d919bb1f259d52b890717 commit 5723d13811dbecd3277d919bb1f259d52b890717 Author: Jung-uk Kim AuthorDate: 2022-10-28 02:36:35 +0000 Commit: Jung-uk Kim 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;