summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/include/actypes.h
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2010-07-06 20:57:28 +0000
committerjkim <jkim@FreeBSD.org>2010-07-06 20:57:28 +0000
commitee32cc37846fecf2cb4ccc3dbb6b5b016d146813 (patch)
treea1a1e6ac1daa6cd0de9bf90f7809c15a3f9bc326 /sys/contrib/dev/acpica/include/actypes.h
parenta3fd34d6553f34a17c1ec61d3694f885e251cf65 (diff)
parent9ef1b91c0f59a1a15565c354b3e372ab265c7b5a (diff)
downloadFreeBSD-src-ee32cc37846fecf2cb4ccc3dbb6b5b016d146813.zip
FreeBSD-src-ee32cc37846fecf2cb4ccc3dbb6b5b016d146813.tar.gz
Merge ACPICA 20100702.
Diffstat (limited to 'sys/contrib/dev/acpica/include/actypes.h')
-rw-r--r--sys/contrib/dev/acpica/include/actypes.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/contrib/dev/acpica/include/actypes.h b/sys/contrib/dev/acpica/include/actypes.h
index 601e87e..949100c 100644
--- a/sys/contrib/dev/acpica/include/actypes.h
+++ b/sys/contrib/dev/acpica/include/actypes.h
@@ -742,16 +742,11 @@ typedef UINT32 ACPI_EVENT_STATUS;
#define ACPI_GPE_MAX 0xFF
#define ACPI_NUM_GPE 256
-/* Actions for AcpiSetGpe */
+/* Actions for AcpiSetGpe, AcpiGpeWakeup, AcpiHwLowSetGpe */
#define ACPI_GPE_ENABLE 0
#define ACPI_GPE_DISABLE 1
-
-/* GpeTypes for AcpiEnableGpe and AcpiDisableGpe */
-
-#define ACPI_GPE_TYPE_WAKE (UINT8) 0x01
-#define ACPI_GPE_TYPE_RUNTIME (UINT8) 0x02
-#define ACPI_GPE_TYPE_WAKE_RUN (UINT8) 0x03
+#define ACPI_GPE_CONDITIONAL_ENABLE 2
/*
* GPE info flags - Per GPE
OpenPOWER on IntegriCloud