Vendor import of the Intel ACPI CA 20020217 drop.

1 files changed, 41 insertions, 41 deletions

diff --git a/sys/contrib/dev/acpica/acnamesp.h b/sys/contrib/dev/acpica/acnamesp.h
index 2c94fa43fdf4..e45c93ae836e 100644
--- a/sys/contrib/dev/acpica/acnamesp.h
+++ b/sys/contrib/dev/acpica/acnamesp.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acnamesp.h - Namespace subcomponent prototypes and defines
- *       $Revision: 115 $
+ *       $Revision: 123 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -120,37 +120,37 @@
 
 /* To search the entire name space, pass this as SearchBase */
 
-#define NS_ALL                  ((ACPI_HANDLE)0)
+#define ACPI_NS_ALL                 ((ACPI_HANDLE)0)
 
 /*
  * Elements of AcpiNsProperties are bit significant
  * and should be one-to-one with values of ACPI_OBJECT_TYPE
  */
-#define NSP_NORMAL              0
-#define NSP_NEWSCOPE            1   /* a definition of this type opens a name scope */
-#define NSP_LOCAL               2   /* suppress search of enclosing scopes */
+#define ACPI_NS_NORMAL              0
+#define ACPI_NS_NEWSCOPE            1   /* a definition of this type opens a name scope */
+#define ACPI_NS_LOCAL               2   /* suppress search of enclosing scopes */
 
 
 /* Definitions of the predefined namespace names  */
 
-#define ACPI_UNKNOWN_NAME       (UINT32) 0x3F3F3F3F     /* Unknown name is  "????" */
-#define ACPI_ROOT_NAME          (UINT32) 0x2F202020     /* Root name is     "/   " */
-#define ACPI_SYS_BUS_NAME       (UINT32) 0x5F53425F     /* Sys bus name is  "_SB_" */
+#define ACPI_UNKNOWN_NAME           (UINT32) 0x3F3F3F3F     /* Unknown name is  "????" */
+#define ACPI_ROOT_NAME              (UINT32) 0x2F202020     /* Root name is     "/   " */
+#define ACPI_SYS_BUS_NAME           (UINT32) 0x5F53425F     /* Sys bus name is  "_SB_" */
 
-#define NS_ROOT_PATH            "\\"
-#define NS_SYSTEM_BUS           "_SB_"
+#define ACPI_NS_ROOT_PATH           "\\"
+#define ACPI_NS_SYSTEM_BUS          "_SB_"
 
 
 /* Flags for AcpiNsLookup, AcpiNsSearchAndEnter */
 
-#define NS_NO_UPSEARCH          0
-#define NS_SEARCH_PARENT        0x01
-#define NS_DONT_OPEN_SCOPE      0x02
-#define NS_NO_PEER_SEARCH       0x04
-#define NS_ERROR_IF_FOUND       0x08
+#define ACPI_NS_NO_UPSEARCH         0
+#define ACPI_NS_SEARCH_PARENT       0x01
+#define ACPI_NS_DONT_OPEN_SCOPE     0x02
+#define ACPI_NS_NO_PEER_SEARCH      0x04
+#define ACPI_NS_ERROR_IF_FOUND      0x08
 
-#define NS_WALK_UNLOCK          TRUE
-#define NS_WALK_NO_UNLOCK       FALSE
+#define ACPI_NS_WALK_UNLOCK         TRUE
+#define ACPI_NS_WALK_NO_UNLOCK      FALSE
 
 
 ACPI_STATUS
@@ -185,7 +185,7 @@ AcpiNsInitOneObject (
 
 ACPI_STATUS
 AcpiNsWalkNamespace (
-    ACPI_OBJECT_TYPE8       Type,
+    ACPI_OBJECT_TYPE        Type,
     ACPI_HANDLE             StartObject,
     UINT32                  MaxDepth,
     BOOLEAN                 UnlockBeforeCallback,
@@ -195,7 +195,7 @@ AcpiNsWalkNamespace (
 
 ACPI_NAMESPACE_NODE *
 AcpiNsGetNextNode (
-    ACPI_OBJECT_TYPE8       Type,
+    ACPI_OBJECT_TYPE        Type,
     ACPI_NAMESPACE_NODE     *Parent,
     ACPI_NAMESPACE_NODE     *Child);
 
@@ -239,8 +239,8 @@ ACPI_STATUS
 AcpiNsLookup (
     ACPI_GENERIC_STATE      *ScopeInfo,
     NATIVE_CHAR             *Name,
-    ACPI_OBJECT_TYPE8       Type,
-    OPERATING_MODE          InterpreterMode,
+    ACPI_OBJECT_TYPE        Type,
+    ACPI_INTERPRETER_MODE   InterpreterMode,
     UINT32                  Flags,
     ACPI_WALK_STATE         *WalkState,
     ACPI_NAMESPACE_NODE     **RetNode);
@@ -317,7 +317,7 @@ AcpiNsDumpRootDevices (
 
 void
 AcpiNsDumpObjects (
-    ACPI_OBJECT_TYPE8       Type,
+    ACPI_OBJECT_TYPE        Type,
     UINT8                   DisplayType,
     UINT32                  MaxDepth,
     UINT32                  OwnderId,
@@ -373,15 +373,15 @@ AcpiNsExistDownstreamSibling (
 
 
 /*
- * Scope manipulation - nsscope
+ * Name and Scope manipulation - nsnames
  */
 
 UINT32
 AcpiNsOpensScope (
-    ACPI_OBJECT_TYPE8       Type);
+    ACPI_OBJECT_TYPE        Type);
 
 NATIVE_CHAR *
-AcpiNsGetTablePathname (
+AcpiNsGetExternalPathname (
     ACPI_NAMESPACE_NODE     *Node);
 
 NATIVE_CHAR *
@@ -390,9 +390,8 @@ AcpiNsNameOfCurrentScope (
 
 ACPI_STATUS
 AcpiNsHandleToPathname (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  *BufSize,
-    NATIVE_CHAR             *UserBuffer);
+    ACPI_HANDLE             TargetHandle,
+    ACPI_BUFFER             *Buffer);
 
 BOOLEAN
 AcpiNsPatternMatch (
@@ -400,25 +399,26 @@ AcpiNsPatternMatch (
     NATIVE_CHAR             *SearchFor);
 
 ACPI_STATUS
-AcpiNsGetNode (
-    NATIVE_CHAR             *Pathname,
+AcpiNsGetNodeByPath (
+    NATIVE_CHAR             *ExternalPathname,
     ACPI_NAMESPACE_NODE     *InPrefixNode,
+    UINT32                  Flags,
     ACPI_NAMESPACE_NODE     **OutNode);
 
-UINT32
+ACPI_SIZE
 AcpiNsGetPathnameLength (
     ACPI_NAMESPACE_NODE     *Node);
 
 
 /*
- * Object management for NTEs - nsobject
+ * Object management for namespace nodes - nsobject
  */
 
 ACPI_STATUS
 AcpiNsAttachObject (
     ACPI_NAMESPACE_NODE     *Node,
     ACPI_OPERAND_OBJECT     *Object,
-    ACPI_OBJECT_TYPE8       Type);
+    ACPI_OBJECT_TYPE        Type);
 
 ACPI_OPERAND_OBJECT *
 AcpiNsGetAttachedObject (
@@ -455,8 +455,8 @@ AcpiNsSearchAndEnter (
     UINT32                  EntryName,
     ACPI_WALK_STATE         *WalkState,
     ACPI_NAMESPACE_NODE     *Node,
-    OPERATING_MODE          InterpreterMode,
-    ACPI_OBJECT_TYPE8       Type,
+    ACPI_INTERPRETER_MODE   InterpreterMode,
+    ACPI_OBJECT_TYPE        Type,
     UINT32                  Flags,
     ACPI_NAMESPACE_NODE     **RetNode);
 
@@ -464,7 +464,7 @@ ACPI_STATUS
 AcpiNsSearchNode (
     UINT32                  EntryName,
     ACPI_NAMESPACE_NODE     *Node,
-    ACPI_OBJECT_TYPE8       Type,
+    ACPI_OBJECT_TYPE        Type,
     ACPI_NAMESPACE_NODE     **RetNode);
 
 void
@@ -472,7 +472,7 @@ AcpiNsInstallNode (
     ACPI_WALK_STATE         *WalkState,
     ACPI_NAMESPACE_NODE     *ParentNode,    /* Parent */
     ACPI_NAMESPACE_NODE     *Node,      /* New Child*/
-    ACPI_OBJECT_TYPE8       Type);
+    ACPI_OBJECT_TYPE        Type);
 
 
 /*
@@ -487,13 +487,13 @@ BOOLEAN
 AcpiNsValidPathSeparator (
     NATIVE_CHAR             Sep);
 
-ACPI_OBJECT_TYPE8
+ACPI_OBJECT_TYPE
 AcpiNsGetType (
     ACPI_NAMESPACE_NODE     *Node);
 
 UINT32
 AcpiNsLocal (
-    ACPI_OBJECT_TYPE8       Type);
+    ACPI_OBJECT_TYPE        Type);
 
 ACPI_STATUS
 AcpiNsBuildInternalName (
@@ -528,7 +528,7 @@ AcpiNsTerminate (
     void);
 
 ACPI_NAMESPACE_NODE *
-AcpiNsGetParentObject (
+AcpiNsGetParentNode (
     ACPI_NAMESPACE_NODE     *Node);