[src/trunk]: src/sys/arch/arm Change pci_conf_hook to pass pc->conf_v

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e69d43bf9c4b
branches:  trunk
changeset: 781432:e69d43bf9c4b
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Sep 06 02:02:03 2012 +0000

description:
Change pci_conf_hook to pass pc->conf_v
Add pci_conf_interrupt

diffstat:

 sys/arch/arm/gemini/gemini_pci.c   |  13 +++++++------
 sys/arch/arm/include/pci_machdep.h |  10 ++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r 1de307f916b6 -r e69d43bf9c4b sys/arch/arm/gemini/gemini_pci.c
--- a/sys/arch/arm/gemini/gemini_pci.c  Wed Sep 05 23:19:13 2012 +0000
+++ b/sys/arch/arm/gemini/gemini_pci.c  Thu Sep 06 02:02:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_pci.c,v 1.11 2012/01/27 18:52:50 para Exp $     */
+/*     $NetBSD: gemini_pci.c,v 1.12 2012/09/06 02:02:04 matt Exp $     */
 
 /* adapted from:
  *     NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.11 2012/01/27 18:52:50 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.12 2012/09/06 02:02:04 matt Exp $");
 
 #include <sys/cdefs.h>
 
@@ -83,8 +83,8 @@
                    int *);
 pcireg_t       gemini_pci_conf_read(void *, pcitag_t, int);
 void           gemini_pci_conf_write(void *, pcitag_t, int, pcireg_t);
-int            gemini_pci_conf_hook(pci_chipset_tag_t, int, int, int,
-                   pcireg_t);
+int            gemini_pci_conf_hook(void *, int, int, int, pcireg_t);
+int            gemini_pci_conf_interrupt(void *, int, int, int, int, int *);
 
 int            gemini_pci_intr_map(const struct pci_attach_args *,
                    pci_intr_handle_t *);
@@ -184,6 +184,7 @@
        pc->pc_intr_disestablish = gemini_pci_intr_disestablish;
 
        pc->pc_conf_hook = gemini_pci_conf_hook;
+       pc->pc_conf_interrupt = gemini_pci_conf_interrupt;
 
        /*
         * initialize copy of CFG_CMD
@@ -233,12 +234,12 @@
 }
 
 void
-pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+gemini_pci_conf_interrupt(void *v, int a, int b, int c, int d, int *p)
 {
 }
 
 int
-gemini_pci_conf_hook(pci_chipset_tag_t pc, int bus, int device, int function, pcireg_t id)
+gemini_pci_conf_hook(void *v, int bus, int device, int function, pcireg_t id)
 {
        int rv;
 
diff -r 1de307f916b6 -r e69d43bf9c4b sys/arch/arm/include/pci_machdep.h
--- a/sys/arch/arm/include/pci_machdep.h        Wed Sep 05 23:19:13 2012 +0000
+++ b/sys/arch/arm/include/pci_machdep.h        Thu Sep 06 02:02:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.h,v 1.8 2012/09/02 13:57:18 matt Exp $     */
+/*     $NetBSD: pci_machdep.h,v 1.9 2012/09/06 02:02:03 matt Exp $     */
 
 /*
  * Modified for arm32 by Mark Brinicombe
@@ -74,9 +74,9 @@
        void            (*pc_intr_disestablish)(void *, void *);
 
 #ifdef __HAVE_PCI_CONF_HOOK
-       int             (*pc_conf_hook)(pci_chipset_tag_t, int, int, int,
-                           pcireg_t);
+       int             (*pc_conf_hook)(void *, int, int, int, pcireg_t);
 #endif
+       void            (*pc_conf_interrupt)(void *, int, int, int, int, int *);
 
        uint32_t        pc_cfg_cmd;
 };
@@ -108,7 +108,9 @@
     (*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv))
 #ifdef __HAVE_PCI_CONF_HOOK
 #define        pci_conf_hook(c, b, d, f, id)                                   \
-    (*(c)->pc_conf_hook)((c), (b), (d), (f), (id))
+    (*(c)->pc_conf_hook)((c)->pc_conf_v, (b), (d), (f), (id))
 #endif
+#define        pci_conf_interrupt(c, b, d, i, s, p)                            \
+    (*(c)->pc_conf_interrupt)((c)->pc_conf_v, (b), (d), (i), (s), (p))
 
 #endif /* _ARM_PCI_MACHDEP_H_ */