PERFORCE change 116892 for review

[Marcel Moolenaar]

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

Change 116892 by marcel at marcel_xcllnt on 2007/03/29 23:29:26

	Catch up with the interrupt filter changes.

Affected files ...

.. //depot/projects/uart/dev/bsc/bsc_core.c#2 edit
.. //depot/projects/uart/dev/hdlc/hdlc_core.c#2 edit

Differences ...

==== //depot/projects/uart/dev/bsc/bsc_core.c#2 (text+ko) ====

@@ -46,9 +46,11 @@
 
 MALLOC_DEFINE(M_BSC, "BSC", "BSC driver");
 
-static void
-bsc_bus_intr(void *arg)
+static int
+bsc_intr(void *arg)
 {
+
+	return (FILTER_STRAY);
 }
 
 int
@@ -70,13 +72,12 @@
 	sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid,
 	    RF_ACTIVE);
 	if (sc->sc_ires != NULL) {
-		error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-		    sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, bsc_bus_intr,
-		    sc, &sc->sc_icookie);
+		error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY,
+		    bsc_intr, NULL, sc, &sc->sc_icookie);
 		if (error)
-			error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-			    sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE,
-			    bsc_bus_intr, sc, &sc->sc_icookie);
+			error = bus_setup_intr(dev, sc->sc_ires,
+			    INTR_TYPE_TTY | INTR_MPSAFE, NULL,
+			    (driver_intr_t *)bsc_intr, sc, &sc->sc_icookie);
 		else
 			sc->sc_fastintr = 1;
 

==== //depot/projects/uart/dev/hdlc/hdlc_core.c#2 (text+ko) ====

@@ -46,9 +46,11 @@
 
 MALLOC_DEFINE(M_HDLC, "HDLC", "HDLC driver");
 
-static void
-hdlc_bus_intr(void *arg)
+static int
+hdlc_intr(void *arg)
 {
+
+	return (FILTER_STRAY);
 }
 
 int
@@ -70,13 +72,12 @@
 	sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid,
 	    RF_ACTIVE);
 	if (sc->sc_ires != NULL) {
-		error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-		    sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, hdlc_bus_intr,
-		    sc, &sc->sc_icookie);
+		error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY,
+		    hdlc_intr, NULL, sc, &sc->sc_icookie);
 		if (error)
-			error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-			    sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE,
-			    hdlc_bus_intr, sc, &sc->sc_icookie);
+			error = bus_setup_intr(dev, sc->sc_ires,
+			    INTR_TYPE_TTY | INTR_MPSAFE, NULL,
+			    (driver_intr_t *)hdlc_intr, sc, &sc->sc_icookie);
 		else
 			sc->sc_fastintr = 1;