aboutsummaryrefslogtreecommitdiffstats
path: root/source/include
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2012-03-20 18:17:33 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2012-03-20 18:17:33 +0000
commitb81dc021b3e3311e46f9e81de4f09855536e8147 (patch)
tree3fa3a8ab860459d0b2c9768eed9142052be1ced3 /source/include
parent5437485bdb98c4b00f15969e013c454426e9c862 (diff)
downloadsrc-b81dc021b3e3311e46f9e81de4f09855536e8147.tar.gz
src-b81dc021b3e3311e46f9e81de4f09855536e8147.zip
Import ACPICA 20120320.vendor/acpica/20120320
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=233237 svn path=/vendor-sys/acpica/20120320/; revision=233238; tag=vendor/acpica/20120320
Diffstat (limited to 'source/include')
-rw-r--r--source/include/achware.h18
-rw-r--r--source/include/aclocal.h1
-rw-r--r--source/include/acnames.h12
-rw-r--r--source/include/acnamesp.h3
-rw-r--r--source/include/acoutput.h1
-rw-r--r--source/include/acpixf.h8
-rw-r--r--source/include/actypes.h10
7 files changed, 36 insertions, 17 deletions
diff --git a/source/include/achware.h b/source/include/achware.h
index 004795dbfa12..f607d1702ac3 100644
--- a/source/include/achware.h
+++ b/source/include/achware.h
@@ -114,15 +114,18 @@ AcpiHwClearAcpiStatus (
*/
ACPI_STATUS
AcpiHwLegacySleep (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
ACPI_STATUS
AcpiHwLegacyWakePrep (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
ACPI_STATUS
AcpiHwLegacyWake (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
/*
@@ -135,15 +138,18 @@ AcpiHwExecuteSleepMethod (
ACPI_STATUS
AcpiHwExtendedSleep (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
ACPI_STATUS
AcpiHwExtendedWakePrep (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
ACPI_STATUS
AcpiHwExtendedWake (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
/*
diff --git a/source/include/aclocal.h b/source/include/aclocal.h
index d29a72157639..30c648dcdbab 100644
--- a/source/include/aclocal.h
+++ b/source/include/aclocal.h
@@ -424,6 +424,7 @@ typedef struct acpi_predefined_data
/* Defines for Flags field above */
#define ACPI_OBJECT_REPAIRED 1
+#define ACPI_OBJECT_WRAPPED 2
/*
diff --git a/source/include/acnames.h b/source/include/acnames.h
index f0bbde8541c1..4c5fab696f15 100644
--- a/source/include/acnames.h
+++ b/source/include/acnames.h
@@ -46,6 +46,7 @@
/* Method names - these methods can appear anywhere in the namespace */
+#define METHOD_NAME__SB_ "_SB_"
#define METHOD_NAME__HID "_HID"
#define METHOD_NAME__CID "_CID"
#define METHOD_NAME__UID "_UID"
@@ -64,11 +65,11 @@
/* Method names - these methods must appear at the namespace root */
-#define METHOD_NAME__BFS "\\_BFS"
-#define METHOD_NAME__GTS "\\_GTS"
-#define METHOD_NAME__PTS "\\_PTS"
-#define METHOD_NAME__SST "\\_SI._SST"
-#define METHOD_NAME__WAK "\\_WAK"
+#define METHOD_PATHNAME__BFS "\\_BFS"
+#define METHOD_PATHNAME__GTS "\\_GTS"
+#define METHOD_PATHNAME__PTS "\\_PTS"
+#define METHOD_PATHNAME__SST "\\_SI._SST"
+#define METHOD_PATHNAME__WAK "\\_WAK"
/* Definitions of the predefined namespace names */
@@ -79,7 +80,6 @@
#define ACPI_PREFIX_LOWER (UINT32) 0x69706361 /* "acpi" */
#define ACPI_NS_ROOT_PATH "\\"
-#define ACPI_NS_SYSTEM_BUS "_SB_"
#endif /* __ACNAMES_H__ */
diff --git a/source/include/acnamesp.h b/source/include/acnamesp.h
index 5e22cb538895..4a91108eae42 100644
--- a/source/include/acnamesp.h
+++ b/source/include/acnamesp.h
@@ -368,8 +368,9 @@ AcpiNsRepairObject (
ACPI_OPERAND_OBJECT **ReturnObjectPtr);
ACPI_STATUS
-AcpiNsRepairPackageList (
+AcpiNsWrapWithPackage (
ACPI_PREDEFINED_DATA *Data,
+ ACPI_OPERAND_OBJECT *OriginalObject,
ACPI_OPERAND_OBJECT **ObjDescPtr);
ACPI_STATUS
diff --git a/source/include/acoutput.h b/source/include/acoutput.h
index 88c1cab71221..a1d89d408cc3 100644
--- a/source/include/acoutput.h
+++ b/source/include/acoutput.h
@@ -72,6 +72,7 @@
#define ACPI_EXAMPLE 0x00004000
#define ACPI_DRIVER 0x00008000
#define DT_COMPILER 0x00010000
+#define ASL_PREPROCESSOR 0x00020000
#define ACPI_ALL_COMPONENTS 0x0001FFFF
#define ACPI_COMPONENT_DEFAULT (ACPI_ALL_COMPONENTS)
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index fafa51f8ebf4..e84d395824af 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -48,7 +48,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20120215
+#define ACPI_CA_VERSION 0x20120320
#include "acconfig.h"
#include "actypes.h"
@@ -674,7 +674,8 @@ AcpiEnterSleepStatePrep (
ACPI_STATUS
AcpiEnterSleepState (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
ACPI_HW_DEPENDENT_RETURN_STATUS (
ACPI_STATUS
@@ -683,7 +684,8 @@ AcpiEnterSleepStateS4bios (
ACPI_STATUS
AcpiLeaveSleepStatePrep (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
ACPI_STATUS
AcpiLeaveSleepState (
diff --git a/source/include/actypes.h b/source/include/actypes.h
index 30d9088b8eb4..0125347070c7 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -520,6 +520,13 @@ typedef UINT64 ACPI_INTEGER;
#define ACPI_SLEEP_TYPE_INVALID 0xFF
/*
+ * Sleep/Wake flags
+ */
+#define ACPI_NO_OPTIONAL_METHODS 0x00 /* Do not execute any optional methods */
+#define ACPI_EXECUTE_GTS 0x01 /* For enter sleep interface */
+#define ACPI_EXECUTE_BFS 0x02 /* For leave sleep prep interface */
+
+/*
* Standard notify values
*/
#define ACPI_NOTIFY_BUS_CHECK (UINT8) 0x00
@@ -797,7 +804,8 @@ typedef UINT8 ACPI_ADR_SPACE_TYPE;
/* Sleep function dispatch */
typedef ACPI_STATUS (*ACPI_SLEEP_FUNCTION) (
- UINT8 SleepState);
+ UINT8 SleepState,
+ UINT8 Flags);
typedef struct acpi_sleep_functions
{