[src/trunk]: src/sys/arch/evbarm Fix pci_conf_interrupt issues

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

details:   https://anonhg.NetBSD.org/src/rev/a71a10d1ce30
branches:  trunk
changeset: 781454:a71a10d1ce30
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 07 04:32:03 2012 +0000

description:
Fix pci_conf_interrupt issues

diffstat:

 sys/arch/evbarm/ifpga/ifpga_pci.c        |  10 +++++++---
 sys/arch/evbarm/ifpga/ifpga_pcivar.h     |   9 ++++++++-
 sys/arch/evbarm/integrator/pci_machdep.c |   7 ++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diffs (88 lines):

diff -r dd830b3e9e28 -r a71a10d1ce30 sys/arch/evbarm/ifpga/ifpga_pci.c
--- a/sys/arch/evbarm/ifpga/ifpga_pci.c Fri Sep 07 04:25:36 2012 +0000
+++ b/sys/arch/evbarm/ifpga/ifpga_pci.c Fri Sep 07 04:32:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifpga_pci.c,v 1.14 2011/04/04 20:37:48 dyoung Exp $    */
+/*     $NetBSD: ifpga_pci.c,v 1.15 2012/09/07 04:32:03 matt Exp $      */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -64,7 +64,7 @@
 #define _ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.14 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.15 2012/09/07 04:32:03 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,7 +114,11 @@
        ifpga_pci_intr_string,
        ifpga_pci_intr_evcnt,
        ifpga_pci_intr_establish,
-       ifpga_pci_intr_disestablish
+       ifpga_pci_intr_disestablish,
+#ifdef __HAVE_PCI_CONF_HOOK
+       NULL,
+#endif
+       ifpga_pci_conf_interrupt,
 };
 
 /*
diff -r dd830b3e9e28 -r a71a10d1ce30 sys/arch/evbarm/ifpga/ifpga_pcivar.h
--- a/sys/arch/evbarm/ifpga/ifpga_pcivar.h      Fri Sep 07 04:25:36 2012 +0000
+++ b/sys/arch/evbarm/ifpga/ifpga_pcivar.h      Fri Sep 07 04:32:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifpga_pcivar.h,v 1.2 2009/07/21 16:04:16 dyoung Exp $ */
+/*     $NetBSD: ifpga_pcivar.h,v 1.3 2012/09/07 04:32:03 matt Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -29,6 +29,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef _EVBARM_IFPGA_PCIVAR_H_
+#define _EVBARM_IFPGA_PCIVAR_H_
+
 struct ifpga_pci_softc {
        bus_space_tag_t         sc_iot;
        bus_space_handle_t      sc_io_ioh;
@@ -53,3 +56,7 @@
 #define IFPGA_PCI_APP1_CONF_BASE       0x61000041
 #define IFPGA_PCI_APP1_CONF_T0_MAP     0x000a          /* Type 0 cycle */
 #define IFPGA_PCI_APP1_CONF_T1_MAP     0x000b          /* Type 1 cycle */
+
+void   ifpga_pci_conf_interrupt(void *, int, int, int, int, int *);
+
+#endif /* !_EVBARM_IFPGA_PCIVAR_H_ */
diff -r dd830b3e9e28 -r a71a10d1ce30 sys/arch/evbarm/integrator/pci_machdep.c
--- a/sys/arch/evbarm/integrator/pci_machdep.c  Fri Sep 07 04:25:36 2012 +0000
+++ b/sys/arch/evbarm/integrator/pci_machdep.c  Fri Sep 07 04:32:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.5 2012/09/07 03:06:05 matt Exp $ */
+/*     $NetBSD: pci_machdep.c,v 1.6 2012/09/07 04:32:04 matt Exp $ */
 
 /*-
  * Copyright (c) 2001 ARM Ltd
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.5 2012/09/07 03:06:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.6 2012/09/07 04:32:04 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -43,9 +43,10 @@
 #include <dev/pci/pciconf.h>
 
 #include <evbarm/ifpga/ifpgareg.h>
+#include <evbarm/ifpga/ifpga_pcivar.h>
 
 void
-pci_conf_interrupt(void *v, int bus, int dev, int ipin, int swiz, int *iline)
+ifpga_pci_conf_interrupt(void *v, int bus, int dev, int ipin, int swiz, int *iline)
 {
        printf("pci_conf_interrupt(v(%p), bus(%d), dev(%d), ipin(%d), swiz(%d), *iline(%p)\n", v, bus, dev, ipin, swiz, iline);
         if (dev >= 9)