From owner-p4-projects@FreeBSD.ORG Wed Apr 19 00:04:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DE3516A423; Wed, 19 Apr 2006 00:04:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26BC716A406 for ; Wed, 19 Apr 2006 00:04:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4E6E43D46 for ; Wed, 19 Apr 2006 00:04:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3J04t32086521 for ; Wed, 19 Apr 2006 00:04:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3J04taP086515 for perforce@freebsd.org; Wed, 19 Apr 2006 00:04:55 GMT (envelope-from marcel@freebsd.org) Date: Wed, 19 Apr 2006 00:04:55 GMT Message-Id: <200604190004.k3J04taP086515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 00:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=95562 Change 95562 by marcel@marcel_nfs on 2006/04/19 00:03:56 Implement puc_intr(). Affected files ... .. //depot/projects/uart/dev/puc/puc.c#29 edit Differences ... ==== //depot/projects/uart/dev/puc/puc.c#29 (text+ko) ==== @@ -63,6 +63,8 @@ driver_intr_t *p_ih; serdev_intr_t *p_ihsrc[PUC_ISRCCNT]; void *p_iharg; + + int p_ipend; }; devclass_t puc_devclass; @@ -127,6 +129,63 @@ static void puc_intr(void *arg) { + struct puc_port *port; + struct puc_softc *sc = arg; + u_long dev, devs; + int i, idx, ipend, isrc; + + /* handle serdev I/F compliant devices first. */ + ipend = 0; + idx = 0, dev = 1UL; + devs = sc->sc_serdevs; + while (devs != 0UL) { + while ((devs & dev) == 0UL) + idx++, dev <<= 1; + devs &= ~dev; + port = &sc->sc_port[idx]; + port->p_ipend = SERDEV_IPEND(port->p_dev); + ipend |= port->p_ipend; + } + + if (ipend == 0) { + idx = 0, dev = 1UL; + devs = ~sc->sc_serdevs & ((1UL << sc->sc_nports) - 1); + while (devs != 0UL) { + while ((devs & dev) == 0UL) + idx++, dev <<= 1; + devs &= ~dev; + port = &sc->sc_port[idx]; + if (port->p_ih != NULL) { + if (port->p_giantintr) { + mtx_lock(&Giant); + (*port->p_ih)(port->p_iharg); + mtx_unlock(&Giant); + } else + (*port->p_ih)(port->p_iharg); + } + } + return; + } + + i = 0, isrc = SER_INT_OVERRUN; + while (ipend) { + while (i < PUC_ISRCCNT && !(ipend & isrc)) + i++, isrc <<= 1; + KASSERT(i < PUC_ISRCCNT, ("%s", __func__)); + ipend &= ~isrc; + idx = 0, dev = 1UL; + devs = sc->sc_serdevs; + while (devs != 0UL) { + while ((devs & dev) == 0UL) + idx++, dev <<= 1; + devs &= ~dev; + port = &sc->sc_port[idx]; + if (!(port->p_ipend & isrc)) + continue; + if (port->p_ihsrc[i] != NULL) + (*port->p_ihsrc[i])(port->p_iharg); + } + } } int