summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorJordan Hargrave <jordan@cvs.openbsd.org>2010-06-29 22:08:30 +0000
committerJordan Hargrave <jordan@cvs.openbsd.org>2010-06-29 22:08:30 +0000
commit239f93eac26516451d8fe99c92ce8e530e1f6e96 (patch)
tree85345019cadae6936addfbeafb4062bd5eab8398 /sys/arch/i386
parentd0c7e69d7f21d2c6df66db72892887d848952ef2 (diff)
Add support for mapping ACPI to PCI devices
ok kettenis, deraadt
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/pci/pci_machdep.c15
-rw-r--r--sys/arch/i386/pci/pci_machdep.h4
2 files changed, 17 insertions, 2 deletions
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index ca6590d4449..fa15c2019d4 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.50 2009/09/28 15:58:30 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.51 2010/06/29 22:08:28 jordan Exp $ */
/* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */
/*-
@@ -657,3 +657,16 @@ pci_init_extents(void)
EX_CONFLICTOK | EX_NOWAIT);
}
}
+
+#include "acpi.h"
+#if NACPI > 0
+void acpi_pci_match(struct device *, struct pci_attach_args *);
+#endif
+
+void
+pci_dev_postattach(struct device *dev, struct pci_attach_args *pa)
+{
+#if NACPI > 0
+ acpi_pci_match(dev, pa);
+#endif
+}
diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h
index b49e21b56a7..853792de17d 100644
--- a/sys/arch/i386/pci/pci_machdep.h
+++ b/sys/arch/i386/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.18 2009/10/06 21:35:43 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.19 2010/06/29 22:08:28 jordan Exp $ */
/* $NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $ */
/*
@@ -102,6 +102,8 @@ void pci_intr_disestablish(pci_chipset_tag_t, void *);
void pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
int *, int *, int *);
+void pci_dev_postattach(struct device *, struct pci_attach_args *);
+
/*
* Section 6.2.4, `Miscellaneous Functions' of the PIC Specification,
* says that 255 means `unknown' or `no connection' to the interrupt