git: 62e841ccce30 - main - acpica: Import ACPICA 20241212

The branch main has been updated by jkim:

URL: https://cgit.FreeBSD.org/src/commit/?id=62e841ccce30eac30ec6fea767fb3bc151225562

commit 62e841ccce30eac30ec6fea767fb3bc151225562
Merge: 1a259ad4ab5b 98a2c01a8898
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2025-01-03 22:44:51 +0000
Commit:     Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2025-01-03 22:58:38 +0000

    acpica: Import ACPICA 20241212

 sys/contrib/dev/acpica/changes.txt                 | 16 ++++++++
 sys/contrib/dev/acpica/common/dmtbinfo3.c          |  2 +-
 .../dev/acpica/components/dispatcher/dsutils.c     |  9 ++++-
 .../dev/acpica/components/events/evxfregn.c        |  1 -
 .../dev/acpica/components/namespace/nsaccess.c     |  8 ++++
 .../dev/acpica/components/parser/psobject.c        | 44 ++++++++--------------
 sys/contrib/dev/acpica/include/acpixf.h            |  2 +-
 sys/contrib/dev/acpica/include/actbl1.h            | 25 ++++++------
 sys/contrib/dev/acpica/include/actbl3.h            |  2 +-
 9 files changed, 65 insertions(+), 44 deletions(-)

diff --cc sys/contrib/dev/acpica/components/namespace/nsaccess.c
index bc1d670b285a,245ee6e56423..cd2d0e7f38b4
--- a/sys/contrib/dev/acpica/components/namespace/nsaccess.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsaccess.c
@@@ -449,7 -449,7 +449,9 @@@ AcpiNsLookup 
      ACPI_NAMESPACE_NODE     *CurrentNode = NULL;
      ACPI_NAMESPACE_NODE     *ThisNode = NULL;
      UINT32                  NumSegments;
++#ifdef ACPI_DEBUG_OUTPUT
      UINT32                  NumCarats;
++#endif
      ACPI_NAME               SimpleName;
      ACPI_OBJECT_TYPE        TypeToCheckFor;
      ACPI_OBJECT_TYPE        ThisSearchType;
@@@ -573,7 -573,7 +575,9 @@@
               * the parent node for each prefix instance.
               */
              ThisNode = PrefixNode;
++#ifdef ACPI_DEBUG_OUTPUT
              NumCarats = 0;
++#endif
              while (*Path == (UINT8) AML_PARENT_PREFIX)
              {
                  /* Name is fully qualified, no search rules apply */
@@@ -588,7 -588,7 +592,9 @@@
  
                  /* Backup to the parent node */
  
++#ifdef ACPI_DEBUG_OUTPUT
                  NumCarats++;
++#endif
                  ThisNode = ThisNode->Parent;
                  if (!ThisNode)
                  {
@@@ -611,12 -611,12 +617,14 @@@
                  }
              }
  
++#ifdef ACPI_DEBUG_OUTPUT
              if (SearchParentFlag == ACPI_NS_NO_UPSEARCH)
              {
                  ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
                      "Search scope is [%4.4s], path has %u carat(s)\n",
                      AcpiUtGetNodeName (ThisNode), NumCarats));
              }
++#endif
          }
  
          /*
diff --cc sys/contrib/dev/acpica/include/acpixf.h
index ecc3116c2504,18f47c9e92d0..bf645648bbc3
--- a/sys/contrib/dev/acpica/include/acpixf.h
+++ b/sys/contrib/dev/acpica/include/acpixf.h
@@@ -154,12 -154,12 +154,12 @@@
  
  /* Current ACPICA subsystem version in YYYYMMDD format */
  
- #define ACPI_CA_VERSION                 0x20240927  
+ #define ACPI_CA_VERSION                 0x20241212  
  
 -#include "acconfig.h"
 -#include "actypes.h"
 -#include "actbl.h"
 -#include "acbuffer.h"
 +#include <contrib/dev/acpica/include/acconfig.h>
 +#include <contrib/dev/acpica/include/actypes.h>
 +#include <contrib/dev/acpica/include/actbl.h>
 +#include <contrib/dev/acpica/include/acbuffer.h>
  
  
  /*****************************************************************************