Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jul 2006 13:50:12 GMT
From:      Paolo Pisati <piso@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 101929 for review
Message-ID:  <200607191350.k6JDoCFx042888@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101929

Change 101929 by piso@piso_longino on 2006/07/19 13:49:32

	Axe INTR_FAST. 

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#5 edit

Differences ...

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

@@ -314,7 +314,7 @@
 	    RF_ACTIVE|RF_SHAREABLE);
 	if (sc->sc_ires != NULL) {
 		error = bus_setup_intr(dev, sc->sc_ires,
-		    INTR_TYPE_TTY | INTR_FAST, puc_intr, NULL,
+		    INTR_TYPE_TTY, puc_intr, NULL,
 		    sc, &sc->sc_icookie);
 		if (error)
 			error = bus_setup_intr(dev, sc->sc_ires,
@@ -606,7 +606,7 @@
 	port = device_get_ivars(child);
 	KASSERT(port != NULL, ("%s %d", __func__, __LINE__));
 
-	if (ihand == NULL || cookiep == NULL || res != port->p_ires)
+	if (filter == NULL || cookiep == NULL || res != port->p_ires)
 		return (EINVAL);
 	if (rman_get_device(port->p_ires) != originator)
 		return (ENXIO);
@@ -630,14 +630,14 @@
 		return (BUS_SETUP_INTR(device_get_parent(dev), originator,
 		    sc->sc_ires, flags, filter, ihand, arg, cookiep));
 
-	/* We demand that serdev devices use fast interrupts. */
-	if (!(flags & INTR_FAST))
+	/* We demand that serdev devices use fast/filter_only interrupts. */
+	if (ihand != NULL)
 		return (ENXIO);
 
 	sc->sc_serdevs |= 1UL << (port->p_nr - 1);
 
 	port->p_hasintr = 1;
-	port->p_ih = ihand;
+	port->p_ih = i(driver_intr_t *)filter;
 	port->p_iharg = arg;
 
 	*cookiep = port;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607191350.k6JDoCFx042888>