summaryrefslogtreecommitdiff
path: root/source/include
diff options
context:
space:
mode:
Diffstat (limited to 'source/include')
-rw-r--r--source/include/acdebug.h4
-rw-r--r--source/include/acpixf.h10
-rw-r--r--source/include/acstruct.h13
-rw-r--r--source/include/acutils.h9
-rw-r--r--source/include/platform/acfreebsd.h4
5 files changed, 34 insertions, 6 deletions
diff --git a/source/include/acdebug.h b/source/include/acdebug.h
index 4e43bbee2235..f296cb9453b9 100644
--- a/source/include/acdebug.h
+++ b/source/include/acdebug.h
@@ -392,6 +392,10 @@ void
AcpiDbGetBusInfo (
void);
+ACPI_STATUS
+AcpiDbDisplayFields (
+ UINT32 AddressSpaceId);
+
/*
* dbdisply - debug display commands
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index a123eed7fd86..62e379096783 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -154,7 +154,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20190816
+#define ACPI_CA_VERSION 0x20191018
#include "acconfig.h"
#include "actypes.h"
@@ -664,7 +664,13 @@ AcpiInstallTable (
ACPI_EXTERNAL_RETURN_STATUS (
ACPI_STATUS
AcpiLoadTable (
- ACPI_TABLE_HEADER *Table))
+ ACPI_TABLE_HEADER *Table,
+ UINT32 *TableIdx))
+
+ACPI_EXTERNAL_RETURN_STATUS (
+ACPI_STATUS
+AcpiUnloadTable (
+ UINT32 TableIndex))
ACPI_EXTERNAL_RETURN_STATUS (
ACPI_STATUS
diff --git a/source/include/acstruct.h b/source/include/acstruct.h
index f81c8a7dd386..e6ab1d907412 100644
--- a/source/include/acstruct.h
+++ b/source/include/acstruct.h
@@ -357,6 +357,19 @@ typedef struct acpi_device_walk_info
} ACPI_DEVICE_WALK_INFO;
+/* Info used by Acpi AcpiDbDisplayFields */
+
+typedef struct acpi_region_walk_info
+{
+ UINT32 DebugLevel;
+ UINT32 Count;
+ ACPI_OWNER_ID OwnerId;
+ UINT8 DisplayType;
+ UINT32 AddressSpaceId;
+
+} ACPI_REGION_WALK_INFO;
+
+
/* TBD: [Restructure] Merge with struct above */
typedef struct acpi_walk_info
diff --git a/source/include/acutils.h b/source/include/acutils.h
index 0c2327d2c3ca..6352b5ff304e 100644
--- a/source/include/acutils.h
+++ b/source/include/acutils.h
@@ -290,10 +290,11 @@ typedef struct acpi_pkg_info
/* AcpiUtDumpBuffer */
-#define DB_BYTE_DISPLAY 1
-#define DB_WORD_DISPLAY 2
-#define DB_DWORD_DISPLAY 4
-#define DB_QWORD_DISPLAY 8
+#define DB_BYTE_DISPLAY 0x01
+#define DB_WORD_DISPLAY 0x02
+#define DB_DWORD_DISPLAY 0x04
+#define DB_QWORD_DISPLAY 0x08
+#define DB_DISPLAY_DATA_ONLY 0x10
/*
diff --git a/source/include/platform/acfreebsd.h b/source/include/platform/acfreebsd.h
index aaeecfb3cfa7..46de7c830bed 100644
--- a/source/include/platform/acfreebsd.h
+++ b/source/include/platform/acfreebsd.h
@@ -203,6 +203,10 @@
#define DEBUGGER_THREADING 0 /* integrated with DDB */
+#ifdef INVARIANTS
+#define ACPI_MUTEX_DEBUG
+#endif
+
#else /* _KERNEL */
#if __STDC_HOSTED__