Vendor import of Intel ACPI-CA 20040514.

1 files changed, 48 insertions, 28 deletions

diff --git a/sys/contrib/dev/acpica/actypes.h b/sys/contrib/dev/acpica/actypes.h
index 8c3804f..98abcc5 100644
--- a/sys/contrib/dev/acpica/actypes.h
+++ b/sys/contrib/dev/acpica/actypes.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actypes.h - Common data types for the entire ACPI subsystem
- *       $Revision: 266 $
+ *       $Revision: 270 $
  *
  *****************************************************************************/
 
@@ -636,34 +636,56 @@ typedef UINT32                          ACPI_EVENT_STATUS;
 #define ACPI_GPE_MAX                    0xFF
 #define ACPI_NUM_GPE                    256
 
+#define ACPI_GPE_ENABLE                 0
+#define ACPI_GPE_DISABLE                1
+
+
 /*
  * GPE info flags - Per GPE
- * +---------+-+-+-+
- * |Bits 8:3 |2|1|0|
- * +---------+-+-+-+
- *          | | | |
- *          | | | +- Edge or Level Triggered
- *          | | +--- Type: Wake or Runtime
- *          | +----- Enabled for wake?
- *          +--------<Reserved>
+ * +-+-+-+---+---+-+
+ * |7|6|5|4:3|2:1|0|
+ * +-+-+-+---+---+-+
+ *  | | |  |   |  |
+ *  | | |  |   |  +--- Interrupt type: Edge or Level Triggered
+ *  | | |  |   +--- Type: Wake-only, Runtime-only, or wake/runtime
+ *  | | |  +--- Type of dispatch -- to method, handler, or none
+ *  | | +--- Enabled for runtime?
+ *  | +--- Enabled for wake?
+ *  +--- System state when GPE ocurred (running/waking)
  */
-#define ACPI_GPE_XRUPT_TYPE_MASK        (UINT8) 1
-#define ACPI_GPE_LEVEL_TRIGGERED        (UINT8) 1
-#define ACPI_GPE_EDGE_TRIGGERED         (UINT8) 0
+#define ACPI_GPE_XRUPT_TYPE_MASK        (UINT8) 0x01
+#define ACPI_GPE_LEVEL_TRIGGERED        (UINT8) 0x01
+#define ACPI_GPE_EDGE_TRIGGERED         (UINT8) 0x00
+
+#define ACPI_GPE_TYPE_MASK              (UINT8) 0x06
+#define ACPI_GPE_TYPE_WAKE_RUN          (UINT8) 0x06
+#define ACPI_GPE_TYPE_WAKE              (UINT8) 0x02
+#define ACPI_GPE_TYPE_RUNTIME           (UINT8) 0x04    /* Default */
+
+#define ACPI_GPE_DISPATCH_MASK          (UINT8) 0x18
+#define ACPI_GPE_DISPATCH_HANDLER       (UINT8) 0x08
+#define ACPI_GPE_DISPATCH_METHOD        (UINT8) 0x10
+#define ACPI_GPE_DISPATCH_NOT_USED      (UINT8) 0x00    /* Default */
+
+#define ACPI_GPE_RUN_ENABLE_MASK        (UINT8) 0x20
+#define ACPI_GPE_RUN_ENABLED            (UINT8) 0x20
+#define ACPI_GPE_RUN_DISABLED           (UINT8) 0x00    /* Default */
 
-#define ACPI_GPE_TYPE_MASK              (UINT8) 2
-#define ACPI_GPE_TYPE_WAKE              (UINT8) 2
-#define ACPI_GPE_TYPE_RUNTIME           (UINT8) 0       /* Default */
+#define ACPI_GPE_WAKE_ENABLE_MASK       (UINT8) 0x40
+#define ACPI_GPE_WAKE_ENABLED           (UINT8) 0x40
+#define ACPI_GPE_WAKE_DISABLED          (UINT8) 0x00    /* Default */
 
-#define ACPI_GPE_ENABLE_MASK            (UINT8) 4
-#define ACPI_GPE_ENABLED                (UINT8) 4
-#define ACPI_GPE_DISABLED               (UINT8) 0       /* Default */
+#define ACPI_GPE_ENABLE_MASK            (UINT8) 0x60    /* Both run/wake */
+
+#define ACPI_GPE_SYSTEM_MASK            (UINT8) 0x80
+#define ACPI_GPE_SYSTEM_RUNNING         (UINT8) 0x80
+#define ACPI_GPE_SYSTEM_WAKING          (UINT8) 0x00
 
 /*
  * Flags for GPE and Lock interfaces
  */
-#define ACPI_EVENT_WAKE_ENABLE          0x2
-#define ACPI_EVENT_WAKE_DISABLE         0x2
+#define ACPI_EVENT_WAKE_ENABLE          0x2             /* AcpiGpeEnable */
+#define ACPI_EVENT_WAKE_DISABLE         0x2             /* AcpiGpeDisable */
 
 #define ACPI_NOT_ISR                    0x1
 #define ACPI_ISR                        0x0
@@ -671,9 +693,10 @@ typedef UINT32                          ACPI_EVENT_STATUS;
 
 /* Notify types */
 
-#define ACPI_SYSTEM_NOTIFY              0
-#define ACPI_DEVICE_NOTIFY              1
-#define ACPI_MAX_NOTIFY_HANDLER_TYPE    1
+#define ACPI_SYSTEM_NOTIFY              0x1
+#define ACPI_DEVICE_NOTIFY              0x2
+#define ACPI_ALL_NOTIFY                 0x3
+#define ACPI_MAX_NOTIFY_HANDLER_TYPE    0x3
 
 #define ACPI_MAX_SYS_NOTIFY             0x7f
 
@@ -874,10 +897,6 @@ UINT32 (*ACPI_EVENT_HANDLER) (
     void                        *Context);
 
 typedef
-void (*ACPI_GPE_HANDLER) (
-    void                        *Context);
-
-typedef
 void (*ACPI_NOTIFY_HANDLER) (
     ACPI_HANDLE                 Device,
     UINT32                      Value,
@@ -967,6 +986,7 @@ typedef struct acpi_compatible_id_list
 #define ACPI_VALID_HID                  0x0004
 #define ACPI_VALID_UID                  0x0008
 #define ACPI_VALID_CID                  0x0010
+#define ACPI_VALID_SXDS                 0x0020
 
 
 #define ACPI_COMMON_OBJ_INFO \
@@ -987,12 +1007,12 @@ typedef struct acpi_device_info
 {
     ACPI_COMMON_OBJ_INFO;
 
-    UINT8                       HighestDstates[4];  /* _SxD values 0xFF indicates not valid */
     UINT32                      Valid;              /* Indicates which fields below are valid */
     UINT32                      CurrentStatus;      /* _STA value */
     ACPI_INTEGER                Address;            /* _ADR value if any */
     ACPI_DEVICE_ID              HardwareId;         /* _HID value if any */
     ACPI_DEVICE_ID              UniqueId;           /* _UID value if any */
+    UINT8                       HighestDstates[4];  /* _SxD values: 0xFF indicates not valid */
     ACPI_COMPATIBLE_ID_LIST     CompatibilityId;    /* List of _CIDs if any */
 
 } ACPI_DEVICE_INFO;