From owner-p4-projects@FreeBSD.ORG Sat Dec 15 18:19:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CAB16A4ED; Sat, 15 Dec 2007 18:19:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48D5516A50A for ; Sat, 15 Dec 2007 18:19:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29ADE13C45D for ; Sat, 15 Dec 2007 18:19:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFIJUUD097717 for ; Sat, 15 Dec 2007 18:19:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFIJUQi097714 for perforce@freebsd.org; Sat, 15 Dec 2007 18:19:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 18:19:30 GMT Message-Id: <200712151819.lBFIJUQi097714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130966 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: Sat, 15 Dec 2007 18:19:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=130966 Change 130966 by hselasky@hselasky_laptop001 on 2007/12/15 18:19:21 Reintroduce support for non KVA to UCOM layer. Reverts change 130019 . Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#26 (text+ko) ==== @@ -1023,8 +1023,10 @@ ucom_get_data(struct ucom_softc *sc, struct usbd_page_cache *pc, uint32_t offset, uint32_t len, uint32_t *actlen) { + struct usbd_page_search res; struct tty *tp = sc->sc_tty; uint32_t cnt; + uint32_t offset_orig; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -1054,9 +1056,27 @@ DPRINTF(0, "stopped\n"); goto done; } - cnt = q_to_b(&(tp->t_outq), usbd_get_buffer(pc, offset), len); + offset_orig = offset; + + while (len != 0) { + + usbd_get_page(pc, offset, &res); + + if (res.length > len) { + res.length = len; + } + cnt = q_to_b(&(tp->t_outq), res.buffer, res.length); + + offset += cnt; + len -= cnt; + + if (cnt < res.length) { + /* end of buffer */ + break; + } + } - actlen[0] = cnt; + actlen[0] = offset - offset_orig; DPRINTF(0, "cnt=%d\n", actlen[0]); @@ -1079,8 +1099,8 @@ ucom_put_data(struct ucom_softc *sc, struct usbd_page_cache *pc, uint32_t offset, uint32_t len) { + struct usbd_page_search res; struct tty *tp = sc->sc_tty; - uint8_t *buf; uint32_t cnt; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -1091,19 +1111,28 @@ } /* set a flag to prevent recursation ? */ - buf = usbd_get_buffer(pc, offset); + while (len > 0) { + + usbd_get_page(pc, offset, &res); + + if (res.length > len) { + res.length = len; + } + len -= res.length; + offset += res.length; if (tp->t_state & TS_CAN_BYPASS_L_RINT) { - if (((tp->t_rawq.c_cc + len) > tp->t_ihiwat) && + if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) && ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || (tp->t_iflag & IXOFF)) && (!(tp->t_state & TS_TBLOCK))) { ttyblock(tp); } - cnt = b_to_q(buf, len, &(tp->t_rawq)); + + cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq)); - tp->t_rawcc += len; + tp->t_rawcc += res.length; ttwakeup(tp); @@ -1120,20 +1149,25 @@ } } else { + uint8_t *buf; + /* pass characters to tty layer */ - for (cnt = 0; cnt != len; cnt++) { + buf = res.buffer; + + for (cnt = 0; cnt != res.length; cnt++) { if (ttyld_rint(tp, buf[cnt]) == -1) { /* XXX what should we do? */ DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, len - cnt); + "chars\n", tp, res.length - cnt); break; } } } + } if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) && (!(sc->sc_mcr & SER_RTS)) &&