PERFORCE change 100214 for review

[Paolo Pisati]

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

Change 100214 by piso at piso_newluxor on 2006/06/28 17:07:18

	Sparc64 compiles again now: while here fixes a bunch of
	unconverted drivers.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/esp/esp_sbus.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/gem/if_gem_pci.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/hme/if_hme_sbus.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/le/if_le_ledma.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/pcf/envctrl.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/pcf/pcf_ebus.c#2 edit
.. //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#3 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/esp/esp_sbus.c#2 (text+ko) ====

@@ -687,7 +687,7 @@
 		return (ENXIO);
 	}
 	if (bus_setup_intr(esc->sc_dev, esc->sc_irqres,
-	    INTR_TYPE_BIO|INTR_MPSAFE, ncr53c9x_intr, sc, &esc->sc_irq)) {
+	    INTR_TYPE_BIO|INTR_MPSAFE, NULL, ncr53c9x_intr, sc, &esc->sc_irq)) {
 		device_printf(esc->sc_dev, "cannot set up interrupt\n");
 		error = ENXIO;
 		goto fail_ires;

==== //depot/projects/soc2006/intr_filter/dev/gem/if_gem_pci.c#2 (text+ko) ====

@@ -210,7 +210,7 @@
 	}
 
 	if (bus_setup_intr(dev, gsc->gsc_ires, INTR_TYPE_NET | INTR_MPSAFE,
-	    gem_intr, sc, &gsc->gsc_ih) != 0) {
+	    NULL, gem_intr, sc, &gsc->gsc_ih) != 0) {
 		device_printf(dev, "failed to set up interrupt\n");
 		gem_detach(sc);
 		goto fail_ires;

==== //depot/projects/soc2006/intr_filter/dev/hme/if_hme_sbus.c#2 (text+ko) ====

@@ -269,7 +269,7 @@
 	}
 
 	if ((error = bus_setup_intr(dev, hsc->hsc_ires, INTR_TYPE_NET |
-	    INTR_MPSAFE, hme_intr, sc, &hsc->hsc_ih)) != 0) {
+	    INTR_MPSAFE, NULL, hme_intr, sc, &hsc->hsc_ih)) != 0) {
 		device_printf(dev, "couldn't establish interrupt\n");
 		hme_detach(sc);
 		goto fail_ires;

==== //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#2 (text+ko) ====

@@ -294,7 +294,7 @@
 	locksetup++;
 
 	if (bus_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS,
-	    isp_sbus_intr, isp, &sbs->ih)) {
+	    NULL, isp_sbus_intr, isp, &sbs->ih)) {
 		device_printf(dev, "could not setup interrupt\n");
 		goto bad;
 	}

==== //depot/projects/soc2006/intr_filter/dev/le/if_le_ledma.c#2 (text+ko) ====

@@ -419,7 +419,7 @@
 	}
 
 	error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE,
-	    am7990_intr, sc, &lesc->sc_ih);
+	    NULL, am7990_intr, sc, &lesc->sc_ih);
 	if (error != 0) {
 		device_printf(dev, "cannot set up interrupt\n");
 		goto fail_am7990;

==== //depot/projects/soc2006/intr_filter/dev/pcf/envctrl.c#2 (text+ko) ====

@@ -135,7 +135,7 @@
 
 	rv = bus_setup_intr(dev, sc->res_irq,
 			    INTR_TYPE_NET /* | INTR_ENTROPY */,
-			    pcf_intr, sc, &sc->intr_cookie);
+			    NULL, pcf_intr, sc, &sc->intr_cookie);
 	if (rv) {
 		device_printf(dev, "could not setup IRQ\n");
 		goto error;

==== //depot/projects/soc2006/intr_filter/dev/pcf/pcf_ebus.c#2 (text+ko) ====

@@ -194,7 +194,7 @@
 
 	if (sc->res_irq) {
 		rv = bus_setup_intr(dev, sc->res_irq,
-		    INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc,
+		    INTR_TYPE_NET /* | INTR_ENTROPY */, NULL, pcf_intr, sc,
 		    &sc->intr_cookie);
 		if (rv) {
 			device_printf(dev, "could not setup IRQ\n");

==== //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#3 (text+ko) ====

@@ -79,7 +79,7 @@
 		   void *iva);
 void	intr_init1(void);
 void	intr_init2(void);
-int	inthand_add(const char *name, int vec, driver_filter_t *filter, 
+int	inthand_add(const char *name, int vec, int (*filter)(void *),
     void (*handler)(void *), void *arg, int flags, void **cookiep);
 int	inthand_remove(int vec, void *cookie);