Module Name: src
Committed By: matt
Date: Fri Sep 7 04:32:04 UTC 2012
Modified Files:
src/sys/arch/evbarm/ifpga: ifpga_pci.c ifpga_pcivar.h
src/sys/arch/evbarm/integrator: pci_machdep.c
Log Message:
Fix pci_conf_interrupt issues
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/ifpga/ifpga_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/ifpga/ifpga_pcivar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/integrator/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/ifpga/ifpga_pci.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.14 src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.15
--- src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.14 Mon Apr 4 20:37:48 2011
+++ src/sys/arch/evbarm/ifpga/ifpga_pci.c Fri Sep 7 04:32:03 2012
@@ -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 @@ struct arm32_pci_chipset ifpga_pci_chips
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,
};
/*
Index: src/sys/arch/evbarm/ifpga/ifpga_pcivar.h
diff -u src/sys/arch/evbarm/ifpga/ifpga_pcivar.h:1.2 src/sys/arch/evbarm/ifpga/ifpga_pcivar.h:1.3
--- src/sys/arch/evbarm/ifpga/ifpga_pcivar.h:1.2 Tue Jul 21 16:04:16 2009
+++ src/sys/arch/evbarm/ifpga/ifpga_pcivar.h Fri Sep 7 04:32:03 2012
@@ -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 @@ struct ifpga_pci_softc {
#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_ */
Index: src/sys/arch/evbarm/integrator/pci_machdep.c
diff -u src/sys/arch/evbarm/integrator/pci_machdep.c:1.5 src/sys/arch/evbarm/integrator/pci_machdep.c:1.6
--- src/sys/arch/evbarm/integrator/pci_machdep.c:1.5 Fri Sep 7 03:06:05 2012
+++ src/sys/arch/evbarm/integrator/pci_machdep.c Fri Sep 7 04:32:04 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#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)
