summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Hargrave <jordan@cvs.openbsd.org>2005-12-28 03:06:31 +0000
committerJordan Hargrave <jordan@cvs.openbsd.org>2005-12-28 03:06:31 +0000
commit2f98ca3580d266d3dc41dc8e65ca1d65e965d84e (patch)
tree5089014a46d9792e334cfb1f7cd227f8c67a0db5
parent054831881c60e8d7e80c1bb5155e6d66936b67b7 (diff)
oops. forgot this. part of dsdt parsing changes
ok marco@
-rw-r--r--sys/dev/acpi/acpivar.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 5eb917bd667..e5fbe3c7c87 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpivar.h,v 1.7 2005/12/16 18:59:41 jordan Exp $ */
+/* $OpenBSD: acpivar.h,v 1.8 2005/12/28 03:06:30 jordan Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -20,7 +20,6 @@
#include <sys/timeout.h>
-/* #define ACPI_DEBUG */
#ifdef ACPI_DEBUG
#define dprintf(x...) do { if (acpi_debug) printf(x); } while(0)
#define dnprintf(n,x...) do { if (acpi_debug > (n)) printf(x); } while(0)
@@ -37,6 +36,7 @@ struct acpi_attach_args {
bus_space_tag_t aaa_memt;
void *aaa_table;
paddr_t aaa_pbase; /* Physical base address of ACPI tables */
+ struct aml_node *aaa_node;
};
struct acpi_mem_map {
@@ -74,6 +74,13 @@ typedef SIMPLEQ_HEAD(, acpi_q) acpi_qhead_t;
#define ACPIREG_PM1_EN 0x0F
#define ACPIREG_PM1_CNT 0x10
+struct acpi_parsestate
+{
+ u_int8_t *start;
+ u_int8_t *end;
+ u_int8_t *pos;
+};
+
struct acpi_reg_map {
bus_space_handle_t ioh;
int addr;
@@ -115,6 +122,8 @@ struct acpi_softc {
int sc_powerbtn;
int sc_sleepbtn;
+
+ struct acpi_parsestate amlpc;
};
struct acpi_table {