PERFORCE change 102049 for review

[Paolo Pisati]

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

Change 102049 by piso at piso_longino on 2006/07/21 10:21:18

	Axe INTR_FAST.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#5 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#4 (text+ko) ====

@@ -312,7 +312,7 @@
 		}
 	} else {
 		if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
-				   INTR_FAST|INTR_TYPE_BIO, 
+				   INTR_TYPE_BIO, 
 				   aac_fast_intr, NULL,
 				   sc, &sc->aac_intr)) {
 			device_printf(sc->aac_dev,

==== //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#4 (text+ko) ====

@@ -373,14 +373,15 @@
 	if (error)
 		return (error);
 
+	/* XXX why do we need INTR_MPSAFE if INTR_FAST was declared too?!?!? */
 	i = bus_setup_intr(self, sc->res[2],
-	    INTR_MPSAFE | INTR_TYPE_MISC | INTR_FAST,
-	    (driver_filter_t *)adlink_intr, NULL, sc, &sc->intrhand);
+	    INTR_MPSAFE | INTR_TYPE_MISC,
+	    adlink_intr, NULL, sc, &sc->intrhand);
 	if (i) {
 		printf("adlink: Couldn't get FAST intr\n");
 		i = bus_setup_intr(self, sc->res[2],
 		    INTR_MPSAFE | INTR_TYPE_MISC,
-		    adlink_intr, sc, &sc->intrhand);
+		    NULL, (driver_intr_t *)adlink_intr, sc, &sc->intrhand);
 	}
 
 	if (i) {

==== //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#4 (text+ko) ====

@@ -132,8 +132,8 @@
 		device_printf(dev, "interrupt resource allocation failed\n");
 		goto fail;
 	}
-	if (bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST, 
-			   (driver_filter_t *)cyintr, NULL, vsc, &irq_cookie) != 0) {	    
+	if (bus_setup_intr(dev, irq_res, INTR_TYPE_TTY, 
+			   cyintr, NULL, vsc, &irq_cookie) != 0) {	    
 		device_printf(dev, "interrupt setup failed\n");
 		goto fail;
 	}

==== //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#5 (text+ko) ====

@@ -145,8 +145,8 @@
 		goto fail;
 	}
 #ifdef CY_PCI_FASTINTR
-	irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST,
-	    (driver_filter_t *)cyintr, NULL, vsc, &irq_cookie);
+	irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY,
+	    cyintr, NULL, vsc, &irq_cookie);
 #else
 	irq_setup = ENXIO;
 #endif