PERFORCE change 100062 for review

[Paolo Pisati]

http://perforce.freebsd.org/chv.cgi?CH=100062

Change 100062 by piso at piso_newluxor on 2006/06/26 14:41:49

	Add a filter parameter to fhc_setup_intr(), pscyho_setup_intr() and
	sbus_setup_intr().

Affected files ...

.. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#2 edit
.. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#4 edit
.. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#4 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#2 (text+ko) ====

@@ -206,7 +206,7 @@
 
 int
 fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags,
-    driver_intr_t *func, void *arg, void **cookiep)
+    driver_filter_t *filter, driver_intr_t *func, void *arg, void **cookiep)
 {
 	struct fhc_softc *sc;
 	struct fhc_clr *fc;
@@ -246,8 +246,8 @@
 	bus_space_write_4(bt, bh, FHC_IMAP, inr);
 	bus_space_read_4(bt, bh, FHC_IMAP);
 
-	error = bus_generic_setup_intr(bus, child, r, flags, fhc_intr_stub,
-	    fc, cookiep);
+	error = bus_generic_setup_intr(bus, child, r, flags, filter, 
+	    fhc_intr_stub, fc, cookiep);	    
 	if (error != 0) {
 		free(fc, M_DEVBUF);
 		return (error);

==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#4 (text+ko) ====

@@ -948,7 +948,8 @@
 
 static int
 psycho_setup_intr(device_t dev, device_t child, struct resource *ires,
-    int flags, driver_intr_t *intr, void *arg, void **cookiep)
+    int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, 
+    void **cookiep)
 {
 	struct psycho_softc *sc;
 	struct psycho_clr *pc;
@@ -991,7 +992,7 @@
 	mr = PSYCHO_READ8(sc, intrmapptr);
 	PSYCHO_WRITE8(sc, intrmapptr, mr & ~INTMAP_V);
 	error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
-	    psycho_intr_stub, pc, cookiep);
+	    filter, psycho_intr_stub, pc, cookiep);
 	if (error != 0) {
 		free(pc, M_DEVBUF);
 		return (error);

==== //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#4 (text+ko) ====

@@ -647,7 +647,7 @@
 
 static int
 sbus_setup_intr(device_t dev, device_t child, struct resource *ires, int flags,
-    driver_intr_t *intr, void *arg, void **cookiep)
+    driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep)
 {
 	struct sbus_softc *sc;
 	struct sbus_clr *scl;
@@ -700,7 +700,7 @@
 	/* Disable the interrupt while we fiddle with it */
 	SYSIO_WRITE8(sc, intrmapptr, intrmap & ~INTMAP_V);
 	error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
-	    sbus_intr_stub, scl, cookiep);
+	    filter, sbus_intr_stub, scl, cookiep);
 	if (error != 0) {
 		free(scl, M_DEVBUF);
 		return (error);