Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Let machine-dependent code specify how to enumerate the ...
details: https://anonhg.NetBSD.org/src/rev/d66e7d4aebff
branches: trunk
changeset: 527014:d66e7d4aebff
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed May 15 19:23:51 2002 +0000
description:
Let machine-dependent code specify how to enumerate the bus.
Currently, everyone uses pci_enumerate_bus_generic().
diffstat:
sys/arch/algor/include/pci_machdep.h | 5 ++++-
sys/arch/alpha/include/pci_machdep.h | 5 ++++-
sys/arch/arc/include/pci_machdep.h | 5 ++++-
sys/arch/arm/include/pci_machdep.h | 5 ++++-
sys/arch/atari/include/pci_machdep.h | 5 ++++-
sys/arch/bebox/include/pci_machdep.h | 5 ++++-
sys/arch/cobalt/include/pci_machdep.h | 5 ++++-
sys/arch/dreamcast/include/pci_machdep.h | 5 ++++-
sys/arch/hpcmips/include/pci_machdep.h | 5 ++++-
sys/arch/i386/include/pci_machdep.h | 5 ++++-
sys/arch/macppc/include/pci_machdep.h | 5 ++++-
sys/arch/mips/include/pci_machdep.h | 5 ++++-
sys/arch/mvmeppc/include/pci_machdep.h | 5 ++++-
sys/arch/ofppc/include/pci_machdep.h | 5 ++++-
sys/arch/prep/include/pci_machdep.h | 5 ++++-
sys/arch/sandpoint/include/pci_machdep.h | 5 ++++-
sys/arch/sgimips/include/pci_machdep.h | 5 ++++-
sys/arch/sparc/include/pci_machdep.h | 17 ++++-------------
sys/arch/sparc64/include/pci_machdep.h | 5 ++++-
sys/arch/walnut/include/pci_machdep.h | 6 +++++-
sys/arch/x86_64/include/pci_machdep.h | 5 ++++-
sys/dev/pci/pci.c | 7 ++-----
22 files changed, 87 insertions(+), 38 deletions(-)
diffs (truncated from 424 to 300 lines):
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/algor/include/pci_machdep.h
--- a/sys/arch/algor/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/algor/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.3 2001/10/29 23:34:23 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.4 2002/05/15 19:23:52 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -105,6 +105,9 @@
#define pci_conf_interrupt(c, b, d, p, s, lp) \
(*(c)->pc_conf_interrupt)((c)->pc_intr_v, (b), (d), (p), (s), (lp))
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
/*
* algor-specific PCI functions.
* NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/alpha/include/pci_machdep.h
--- a/sys/arch/alpha/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/alpha/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9 2002/05/15 17:09:58 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.10 2002/05/15 19:23:52 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -99,6 +99,9 @@
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv))
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
/*
* alpha-specific PCI functions.
* NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/arc/include/pci_machdep.h
--- a/sys/arch/arc/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/arc/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.3 2002/05/15 17:15:17 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.4 2002/05/15 19:23:52 thorpej Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -92,3 +92,6 @@
(*(c)->pc_intr_establish)((c), (ih), (l), (h), (a))
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c), (iv))
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/arm/include/pci_machdep.h
--- a/sys/arch/arm/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/arm/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.1 2001/02/23 21:23:48 reinoud Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.2 2002/05/15 19:23:52 thorpej Exp $ */
/*
* Modified for arm32 by Mark Brinicombe
@@ -97,3 +97,6 @@
(*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a))
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv))
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/atari/include/pci_machdep.h
--- a/sys/arch/atari/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/atari/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9 2002/05/15 17:30:04 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.10 2002/05/15 19:23:53 thorpej Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -80,4 +80,7 @@
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
#endif /* _ATARI_PCI_MACHDEP_H_ */
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/bebox/include/pci_machdep.h
--- a/sys/arch/bebox/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/bebox/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9 2001/06/06 17:42:30 matt Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.10 2002/05/15 19:23:53 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -75,3 +75,6 @@
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/cobalt/include/pci_machdep.h
--- a/sys/arch/cobalt/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/cobalt/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.4 2001/06/08 04:48:57 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.5 2002/05/15 19:23:53 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -72,3 +72,6 @@
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/dreamcast/include/pci_machdep.h
--- a/sys/arch/dreamcast/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/dreamcast/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.2 2002/05/15 17:09:05 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.3 2002/05/15 19:23:53 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -94,3 +94,6 @@
(*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a))
#define pci_intr_disestablish(c, ih) \
(*(c)->pc_intr_disestablish)((v)->pc_intr_v, (ih))
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/hpcmips/include/pci_machdep.h
--- a/sys/arch/hpcmips/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/hpcmips/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.2 2002/01/13 14:18:31 takemura Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.3 2002/05/15 19:23:54 thorpej Exp $ */
/*-
* Copyright (c) 2001 Enami Tsugutomo.
@@ -101,3 +101,6 @@
(*(c)->pc_intr_establish)((c), (ih), (l), (h), (a))
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c), (iv))
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/i386/include/pci_machdep.h
--- a/sys/arch/i386/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/i386/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.17 2001/06/08 04:48:57 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.18 2002/05/15 19:23:54 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -100,6 +100,9 @@
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
/*
* ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
* BY PORTABLE CODE.
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/macppc/include/pci_machdep.h
--- a/sys/arch/macppc/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/macppc/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.15 2001/06/19 12:02:57 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.16 2002/05/15 19:23:54 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -88,6 +88,9 @@
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
/*
* Internal functions.
*/
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/mips/include/pci_machdep.h
--- a/sys/arch/mips/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/mips/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.1 2002/03/18 03:08:09 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.2 2002/05/15 19:23:54 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -106,6 +106,9 @@
#define pci_conf_interrupt(c, b, d, p, s, lp) \
(*(c)->pc_conf_interrupt)((c)->pc_intr_v, (b), (d), (p), (s), (lp))
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
/*
* mips-specific PCI functions.
* NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/mvmeppc/include/pci_machdep.h
--- a/sys/arch/mvmeppc/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/mvmeppc/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.1 2002/02/27 21:02:18 scw Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.2 2002/05/15 19:23:55 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -81,6 +81,9 @@
void pci_conf_interrupt(pci_chipset_tag_t pc, int bus, int dev,
int func, int swiz, int *iline);
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
#endif /* _KERNEL */
#endif /* _MACHINE_PCI_MACHDEP_H_ */
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/ofppc/include/pci_machdep.h
--- a/sys/arch/ofppc/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/ofppc/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.1 2001/10/29 22:28:37 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.2 2002/05/15 19:23:55 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -105,6 +105,9 @@
#define pci_conf_interrupt(c, b, d, f, s, lp) \
(*(c)->pc_conf_interrupt)((c)->pc_intr_v, (b), (d), (f), (s), (lp))
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
/*
* PowerPC-specific PCI functions.
* NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/prep/include/pci_machdep.h
--- a/sys/arch/prep/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/prep/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.8 2002/02/25 00:34:13 kleink Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9 2002/05/15 19:23:55 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -102,6 +102,9 @@
#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c)->pc_conf_v, (b), (d), (f), (i))
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
+
#ifdef _KERNEL
/*
* prep-specific PCI functions.
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/sandpoint/include/pci_machdep.h
--- a/sys/arch/sandpoint/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/sandpoint/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.2 2001/06/10 03:16:30 briggs Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.3 2002/05/15 19:23:55 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -72,3 +72,6 @@
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/sgimips/include/pci_machdep.h
--- a/sys/arch/sgimips/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/sgimips/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.2 2000/12/28 22:59:10 sommerfeld Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.3 2002/05/15 19:23:56 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -78,3 +78,6 @@
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
+
+#define pci_enumerate_bus(sc, m, p) \
+ pci_enumerate_bus_generic((sc), (m), (p))
diff -r 11003ae6ac5f -r d66e7d4aebff sys/arch/sparc/include/pci_machdep.h
--- a/sys/arch/sparc/include/pci_machdep.h Wed May 15 19:00:32 2002 +0000
+++ b/sys/arch/sparc/include/pci_machdep.h Wed May 15 19:23:51 2002 +0000
Home |
Main Index |
Thread Index |
Old Index