summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/pci/pci_machdep.h4
-rw-r--r--sys/arch/amd64/include/pci_machdep.h4
-rw-r--r--sys/arch/amd64/pci/pci_machdep.c15
-rw-r--r--sys/arch/arm/include/pci_machdep.h4
-rw-r--r--sys/arch/hppa/include/pci_machdep.h4
-rw-r--r--sys/arch/hppa64/include/pci_machdep.h4
-rw-r--r--sys/arch/i386/pci/pci_machdep.c15
-rw-r--r--sys/arch/i386/pci/pci_machdep.h4
-rw-r--r--sys/arch/landisk/include/pci_machdep.h4
-rw-r--r--sys/arch/loongson/include/pci_machdep.h4
-rw-r--r--sys/arch/powerpc/pci/pci_machdep.h3
-rw-r--r--sys/arch/sgi/pci/pci_machdep.h4
-rw-r--r--sys/arch/sparc64/include/pci_machdep.h4
13 files changed, 60 insertions, 13 deletions
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h
index 1c86e6bfd45..6e20951e387 100644
--- a/sys/arch/alpha/pci/pci_machdep.h
+++ b/sys/arch/alpha/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.22 2009/08/22 02:54:50 mk Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.23 2010/06/29 22:08:28 jordan Exp $ */
/* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */
/*
@@ -127,6 +127,8 @@ void pci_display_console(bus_space_tag_t, bus_space_tag_t,
((c)->pc_pciide_compat_intr_disestablish)((c)->pc_conf_v, \
(cookie)); } while (0)
+#define pci_dev_postattach(a, b)
+
#ifdef _KERNEL
void pci_display_console(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, int, int, int);
#endif /* _KERNEL */
diff --git a/sys/arch/amd64/include/pci_machdep.h b/sys/arch/amd64/include/pci_machdep.h
index 0b493a9b367..439a4265213 100644
--- a/sys/arch/amd64/include/pci_machdep.h
+++ b/sys/arch/amd64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.14 2009/10/06 21:35:43 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.15 2010/06/29 22:08:28 jordan Exp $ */
/* $NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */
/*
@@ -85,6 +85,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 *);
+
/*
* ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
* BY PORTABLE CODE.
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index 265d4dfdbe3..d2f35bed37e 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.32 2009/09/28 15:58:30 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.33 2010/06/29 22:08:29 jordan Exp $ */
/* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@@ -418,3 +418,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/arm/include/pci_machdep.h b/sys/arch/arm/include/pci_machdep.h
index 31a519c982b..9f075e4b56c 100644
--- a/sys/arch/arm/include/pci_machdep.h
+++ b/sys/arch/arm/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.7 2009/08/22 02:54:50 mk Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.8 2010/06/29 22:08:28 jordan Exp $ */
/* $NetBSD: pci_machdep.h,v 1.2 2002/05/15 19:23:52 thorpej Exp $ */
/*
@@ -95,3 +95,5 @@ struct arm32_pci_chipset {
(*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a), (n))
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv))
+
+#define pci_dev_postattach(a, b)
diff --git a/sys/arch/hppa/include/pci_machdep.h b/sys/arch/hppa/include/pci_machdep.h
index 717fb519931..c04ee8fc628 100644
--- a/sys/arch/hppa/include/pci_machdep.h
+++ b/sys/arch/hppa/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.5 2009/08/22 02:54:50 mk Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.6 2010/06/29 22:08:28 jordan Exp $ */
/*
* Copyright (c) 2003 Michael Shalayeff
@@ -88,4 +88,6 @@ struct hppa_pci_chipset_tag {
#define pciide_machdep_compat_intr_establish(a, b, c, d, e) (NULL)
#define pciide_machdep_compat_intr_disestablish(a, b) ((void)(a), (void)(b))
+#define pci_dev_postattach(a, b)
+
#endif /* _MACHINE_PCI_MACHDEP_H_ */
diff --git a/sys/arch/hppa64/include/pci_machdep.h b/sys/arch/hppa64/include/pci_machdep.h
index b92746d0da7..75727c4b20b 100644
--- a/sys/arch/hppa64/include/pci_machdep.h
+++ b/sys/arch/hppa64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.5 2009/08/22 02:54:50 mk Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.6 2010/06/29 22:08:28 jordan Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -79,4 +79,6 @@ struct hppa64_pci_chipset_tag {
#define pciide_machdep_compat_intr_establish(a, b, c, d, e) (NULL)
#define pciide_machdep_compat_intr_disestablish(a, b) ((void)(a), (void)(b))
+#define pci_dev_postattach(a, b)
+
#endif /* _MACHINE_PCI_MACHDEP_H_ */
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
diff --git a/sys/arch/landisk/include/pci_machdep.h b/sys/arch/landisk/include/pci_machdep.h
index eb7a94a9174..cc24efb610d 100644
--- a/sys/arch/landisk/include/pci_machdep.h
+++ b/sys/arch/landisk/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.3 2008/12/06 19:59:38 tedu Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.4 2010/06/29 22:08:28 jordan Exp $ */
/* $NetBSD: pci_machdep.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*
@@ -79,3 +79,5 @@ void landisk_pci_conf_interrupt(void *v, int bus, int dev, int pin,
landisk_pci_intr_establish(v, ih, level, ih_fun, ih_arg, ih_name)
#define pci_intr_disestablish(v, cookie) \
landisk_pci_intr_disestablish(v, cookie)
+
+#define pci_dev_postattach(a, b)
diff --git a/sys/arch/loongson/include/pci_machdep.h b/sys/arch/loongson/include/pci_machdep.h
index 50b4bcc47b7..f4af5f559fb 100644
--- a/sys/arch/loongson/include/pci_machdep.h
+++ b/sys/arch/loongson/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.2 2010/02/05 20:53:26 miod Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.3 2010/06/29 22:08:28 jordan Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -88,3 +88,5 @@ extern paddr_t loongson_dma_base;
pcitag_t pci_make_tag_early(int, int, int);
pcireg_t pci_conf_read_early(pcitag_t, int);
+
+#define pci_dev_postattach(a, b)
diff --git a/sys/arch/powerpc/pci/pci_machdep.h b/sys/arch/powerpc/pci/pci_machdep.h
index 319c2f8223a..3868c325c67 100644
--- a/sys/arch/powerpc/pci/pci_machdep.h
+++ b/sys/arch/powerpc/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.17 2009/08/22 02:54:51 mk Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.18 2010/06/29 22:08:28 jordan Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -93,3 +93,4 @@ struct ppc_pci_chipset {
#define pci_ether_hw_addr(c, s) \
(*(c)->pc_ether_hw_addr)((c), (s))
+#define pci_dev_postattach(a, b)
diff --git a/sys/arch/sgi/pci/pci_machdep.h b/sys/arch/sgi/pci/pci_machdep.h
index 2d7467b851e..51190bca23d 100644
--- a/sys/arch/sgi/pci/pci_machdep.h
+++ b/sys/arch/sgi/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.10 2010/04/06 19:12:34 miod Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.11 2010/06/29 22:08:29 jordan Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -100,3 +100,5 @@ struct mips_pci_chipset {
void pccbb_initialize(pci_chipset_tag_t, pcitag_t, uint, uint, uint);
void ppb_initialize(pci_chipset_tag_t, pcitag_t, uint, uint, uint);
+
+#define pci_dev_postattach(a, b)
diff --git a/sys/arch/sparc64/include/pci_machdep.h b/sys/arch/sparc64/include/pci_machdep.h
index 112e8c0bd16..1e6f29e144c 100644
--- a/sys/arch/sparc64/include/pci_machdep.h
+++ b/sys/arch/sparc64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.23 2009/08/22 02:54:51 mk Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.24 2010/06/29 22:08:29 jordan Exp $ */
/* $NetBSD: pci_machdep.h,v 1.7 2001/07/20 00:07:14 eeh Exp $ */
/*
@@ -98,4 +98,6 @@ int sparc64_pci_enumerate_bus(struct pci_softc *,
#define pciide_machdep_compat_intr_establish(a, b, c, d, e) (NULL)
#define pciide_machdep_compat_intr_disestablish(a, b) do { } while (0)
+#define pci_dev_postattach(a, b)
+
#endif /* _MACHINE_PCI_MACHDEP_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 20:37:44 +0000