Start on a basic ACPI framework -- does not do much more than read out the

ACPI tables into kernel memory and attach ACPI and HPET timers currently.

In order to test this code, enabling the devices in GENERIC as well as
the ACPI_ENABLE option is needed.  This code does not do any thermal
control yet, so this should be done with care depending on the platform.

In the tree so more people can contribute to making this more fully
featured.

Ok niklas@ grange@ tedu@

2 files changed, 12 insertions, 2 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 42a9a622555..43c2cca9c6e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.416 2005/05/27 02:08:14 martin Exp $
+#	$OpenBSD: GENERIC,v 1.417 2005/06/02 20:09:39 tholo Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -56,6 +56,13 @@ isa0	at gscpcib?
 eisa0	at mainbus0
 pci*	at mainbus0
 
+#acpi0	at mainbus?
+#acpitimer* at acpi?
+#hpet*	at acpi?
+
+option		ACPIVERBOSE
+#option		ACPI_ENABLE
+
 option		PCIVERBOSE
 option		EISAVERBOSE
 option		USBVERBOSE
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index c92ad29ca6c..a61bfa4fbf7 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.134 2005/05/21 19:13:55 brad Exp $
+#	$OpenBSD: files.i386,v 1.135 2005/06/02 20:09:39 tholo Exp $
 #
 # new style config file for i386 architecture
 #
@@ -396,3 +396,6 @@ include "dev/i2c/files.i2c"
 # Machine-independent GPIO drivers
 #
 include "dev/gpio/files.gpio"
+
+include "../../../dev/acpi/files.acpi"
+file	arch/i386/i386/acpi_machdep.c		acpi