summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/aclocal.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/aclocal.h')
-rw-r--r--sys/contrib/dev/acpica/aclocal.h32
1 files changed, 25 insertions, 7 deletions
diff --git a/sys/contrib/dev/acpica/aclocal.h b/sys/contrib/dev/acpica/aclocal.h
index d9fb59b..135da9f 100644
--- a/sys/contrib/dev/acpica/aclocal.h
+++ b/sys/contrib/dev/acpica/aclocal.h
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
- * $Revision: 127 $
+ * $Revision: 130 $
*
*****************************************************************************/
@@ -124,7 +124,6 @@ typedef void* ACPI_MUTEX;
typedef UINT32 ACPI_MUTEX_HANDLE;
-
#define ACPI_MEMORY_MODE 0x01
#define ACPI_LOGICAL_ADDRESSING 0x00
#define ACPI_PHYSICAL_ADDRESSING 0x01
@@ -630,15 +629,30 @@ ACPI_STATUS (*ACPI_PARSE_UPWARDS) (
#define ACPI_GET_OP_ARGS(a) ((a)->Flags & ACPI_OP_ARGS_MASK)
#define ACPI_GET_OP_TYPE(a) ((a)->Flags & ACPI_OP_TYPE_MASK)
+/*
+ * Flags byte: 0-4 (5 bits) = Opcode Class (0x001F
+ * 5 (1 bit) = Has arguments flag
+ * 6-7 (2 bits) = Reserved
+ */
+#define AML_NO_ARGS 0
+#define AML_HAS_ARGS 0x0020
+#define AML_NSOBJECT 0x0100
+#define AML_NSOPCODE 0x0200
+#define AML_NSNODE 0x0400
+#define AML_NAMED 0x0800
+#define AML_DEFER 0x1000
+#define AML_FIELD 0x2000
+#define AML_CREATE 0x4000
+
/*
* AML opcode, name, and argument layout
*/
typedef struct acpi_opcode_info
{
- UINT8 Flags; /* Opcode type, HasArgs flag */
UINT32 ParseArgs; /* Grammar/Parse time arguments */
UINT32 RuntimeArgs; /* Interpret time arguments */
+ UINT16 Flags; /* Opcode type, HasArgs flag */
#ifdef _OPCODE_NAMES
NATIVE_CHAR *Name; /* op name (debug only) */
@@ -918,7 +932,6 @@ typedef struct
} ACPI_DEVICE_ID;
-
/*****************************************************************************
*
* Miscellaneous
@@ -945,13 +958,20 @@ typedef struct dbmethodinfo
} DB_METHOD_INFO;
-
/*****************************************************************************
*
* Debug
*
****************************************************************************/
+typedef struct
+{
+ UINT32 ComponentId;
+ NATIVE_CHAR *ProcName;
+ NATIVE_CHAR *ModuleName;
+
+} ACPI_DEBUG_PRINT_INFO;
+
/* Entry for a memory allocation (debug only) */
@@ -984,7 +1004,6 @@ typedef struct AcpiDebugMemBlock
} ACPI_DEBUG_MEM_BLOCK;
-
#define ACPI_MEM_LIST_GLOBAL 0
#define ACPI_MEM_LIST_NSNODE 1
@@ -1021,5 +1040,4 @@ typedef struct
} ACPI_MEMORY_LIST;
-
#endif /* __ACLOCAL_H__ */
OpenPOWER on IntegriCloud