summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/include/acpixf.h
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-07-26 21:34:09 +0000
committerjkim <jkim@FreeBSD.org>2013-07-26 21:34:09 +0000
commite0885a9b34c323faf808677aa57de877e8fbd231 (patch)
tree8a64e569d94e0e829489db627e08ca76d4368bba /sys/contrib/dev/acpica/include/acpixf.h
parent97ac613107cbd046b09fe26d250509b3ed473a3b (diff)
downloadFreeBSD-src-e0885a9b34c323faf808677aa57de877e8fbd231.zip
FreeBSD-src-e0885a9b34c323faf808677aa57de877e8fbd231.tar.gz
Merge ACPICA 20130725.
Diffstat (limited to 'sys/contrib/dev/acpica/include/acpixf.h')
-rw-r--r--sys/contrib/dev/acpica/include/acpixf.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/include/acpixf.h b/sys/contrib/dev/acpica/include/acpixf.h
index b3c76e4..4f4e81a 100644
--- a/sys/contrib/dev/acpica/include/acpixf.h
+++ b/sys/contrib/dev/acpica/include/acpixf.h
@@ -47,7 +47,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20130626
+#define ACPI_CA_VERSION 0x20130725
#include <contrib/dev/acpica/include/acconfig.h>
#include <contrib/dev/acpica/include/actypes.h>
@@ -61,6 +61,7 @@ extern UINT32 AcpiCurrentGpeCount;
extern ACPI_TABLE_FADT AcpiGbl_FADT;
extern BOOLEAN AcpiGbl_SystemAwakeAndRunning;
extern BOOLEAN AcpiGbl_ReducedHardware; /* ACPI 5.0 */
+extern UINT8 AcpiGbl_OsiData;
/* Runtime configuration of debug print levels */
@@ -177,6 +178,10 @@ ACPI_STATUS
AcpiRemoveInterface (
ACPI_STRING InterfaceName);
+ACPI_STATUS
+AcpiUpdateInterfaces (
+ UINT8 Action);
+
UINT32
AcpiCheckAddressRange (
ACPI_ADR_SPACE_TYPE SpaceId,
@@ -268,8 +273,8 @@ AcpiWalkNamespace (
ACPI_OBJECT_TYPE Type,
ACPI_HANDLE StartObject,
UINT32 MaxDepth,
- ACPI_WALK_CALLBACK PreOrderVisit,
- ACPI_WALK_CALLBACK PostOrderVisit,
+ ACPI_WALK_CALLBACK DescendingCallback,
+ ACPI_WALK_CALLBACK AscendingCallback,
void *Context,
void **ReturnValue);
OpenPOWER on IntegriCloud