From owner-svn-src-all@FreeBSD.ORG Tue Jun 23 06:00:32 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01349106566C; Tue, 23 Jun 2009 06:00:32 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E1A0A8FC18; Tue, 23 Jun 2009 06:00:31 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5N60VVR065771; Tue, 23 Jun 2009 06:00:31 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5N60VDi065763; Tue, 23 Jun 2009 06:00:31 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200906230600.n5N60VDi065763@svn.freebsd.org> From: Andrew Thompson Date: Tue, 23 Jun 2009 06:00:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194682 - in head/sys: compat/ndis dev/sound/usb dev/usb dev/usb/net dev/usb/serial netgraph/bluetooth/drivers/ubt X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2009 06:00:32 -0000 Author: thompsa Date: Tue Jun 23 06:00:31 2009 New Revision: 194682 URL: http://svn.freebsd.org/changeset/base/194682 Log: Fix a typeo in the frame len function to unbreak the build, make it shorter while I am here. Modified: head/sys/compat/ndis/subr_usbd.c head/sys/dev/sound/usb/uaudio.c head/sys/dev/usb/net/if_cdce.c head/sys/dev/usb/serial/ufoma.c head/sys/dev/usb/usb_transfer.c head/sys/dev/usb/usbdi.h head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Modified: head/sys/compat/ndis/subr_usbd.c ============================================================================== --- head/sys/compat/ndis/subr_usbd.c Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/compat/ndis/subr_usbd.c Tue Jun 23 06:00:31 2009 (r194682) @@ -981,7 +981,7 @@ usbd_ctrl_callback(struct usb_xfer *xfer if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) { pc = usbd_xfer_get_frame(xfer, 1); - len = usbd_xfer_get_framelen(xfer, 1); + len = usbd_xfer_frame_len(xfer, 1); usbd_copy_out(pc, 0, vcreq->uvc_trans_buf, len); nx->nx_urbactlen += len; } Modified: head/sys/dev/sound/usb/uaudio.c ============================================================================== --- head/sys/dev/sound/usb/uaudio.c Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/dev/sound/usb/uaudio.c Tue Jun 23 06:00:31 2009 (r194682) @@ -1257,7 +1257,7 @@ tr_transferred: offset1 = offset0; pc = usbd_xfer_get_frame(xfer, n); - len = usbd_xfer_get_framelen(xfer, n); + len = usbd_xfer_frame_len(xfer, n); while (len > 0) { Modified: head/sys/dev/usb/net/if_cdce.c ============================================================================== --- head/sys/dev/usb/net/if_cdce.c Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/dev/usb/net/if_cdce.c Tue Jun 23 06:00:31 2009 (r194682) @@ -641,7 +641,7 @@ cdce_bulk_read_callback(struct usb_xfer m = sc->sc_rx_buf[x]; sc->sc_rx_buf[x] = NULL; - len = usbd_xfer_get_frame_len(xfer, x); + len = usbd_xfer_frame_len(xfer, x); /* Strip off CRC added by Zaurus, if any */ if ((sc->sc_flags & CDCE_FLAG_ZAURUS) && len >= 14) Modified: head/sys/dev/usb/serial/ufoma.c ============================================================================== --- head/sys/dev/usb/serial/ufoma.c Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/dev/usb/serial/ufoma.c Tue Jun 23 06:00:31 2009 (r194682) @@ -571,7 +571,7 @@ tr_transferred: if (aframes != nframes) goto tr_setup; pc1 = usbd_xfer_get_frame(xfer, 1); - len = usbd_xfer_get_frame_len(xfer, 1); + len = usbd_xfer_frame_len(xfer, 1); if (len > 0) ucom_put_data(&sc->sc_ucom, pc1, 0, len); /* FALLTHROUGH */ Modified: head/sys/dev/usb/usb_transfer.c ============================================================================== --- head/sys/dev/usb/usb_transfer.c Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/dev/usb/usb_transfer.c Tue Jun 23 06:00:31 2009 (r194682) @@ -1805,7 +1805,7 @@ usbd_xfer_get_frame(struct usb_xfer *xfe } usb_frlength_t -usbd_xfer_get_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex) +usbd_xfer_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex) { KASSERT(frindex < xfer->max_frame_count, ("frame index overflow")); @@ -1832,7 +1832,7 @@ usbd_xfer_set_frame_data(struct usb_xfer } void -usbd_xfer_get_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex, +usbd_xfer_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex, void **ptr, int *len) { KASSERT(frindex < xfer->max_frame_count, ("frame index overflow")); Modified: head/sys/dev/usb/usbdi.h ============================================================================== --- head/sys/dev/usb/usbdi.h Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/dev/usb/usbdi.h Tue Jun 23 06:00:31 2009 (r194682) @@ -469,14 +469,14 @@ void usbd_xfer_set_interval(struct usb_x uint8_t usbd_xfer_state(struct usb_xfer *xfer); void usbd_xfer_set_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex, void *ptr, usb_frlength_t len); -void usbd_xfer_get_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex, +void usbd_xfer_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex, void **ptr, int *len); void usbd_xfer_set_frame_offset(struct usb_xfer *xfer, usb_frlength_t offset, usb_frcount_t frindex); usb_frlength_t usbd_xfer_max_len(struct usb_xfer *xfer); usb_frlength_t usbd_xfer_max_framelen(struct usb_xfer *xfer); usb_frcount_t usbd_xfer_max_frames(struct usb_xfer *xfer); -usb_frlength_t usbd_xfer_get_frame_len(struct usb_xfer *xfer, +usb_frlength_t usbd_xfer_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex); void usbd_xfer_set_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex, usb_frlength_t len); Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c ============================================================================== --- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Tue Jun 23 05:55:56 2009 (r194681) +++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Tue Jun 23 06:00:31 2009 (r194682) @@ -1002,7 +1002,7 @@ ubt_isoc_read_one_frame(struct usb_xfer /* Get existing SCO reassembly buffer */ pc = usbd_xfer_get_frame(xfer, 0); m = sc->sc_isoc_in_buffer; - total = usbd_xfer_get_framelen(xfer, frame_no); + total = usbd_xfer_frame_len(xfer, frame_no); /* While we have data in the frame */ while (total > 0) { @@ -1143,7 +1143,7 @@ send_next: for (n = 0; n < nframes; n ++) { usbd_xfer_set_frame_len(xfer, n, min(offset, usbd_xfer_max_framelen(xfer))); - offset -= usbd_xfer_get_framelen(xfer, n); + offset -= usbd_xfer_frame_len(xfer, n); } usbd_transfer_submit(xfer);