d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a typeo in the frame len function to unbreak the build, make it shorter

Browse Source 
while I am here.
This commit is contained in:
Andrew Thompson 2009-06-23 06:00:31 +00:00
parent c07af67dc8
commit 8f9e0ef947
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/ndis/subr_usbd.c
View File

@ -981,7 +981,7 @@ usbd_ctrl_callback(struct usb_xfer *xfer, usb_error_t error)
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;
}

2
sys/dev/sound/usb/uaudio.c
View File

@ -1257,7 +1257,7 @@ uaudio_chan_record_callback(struct usb_xfer *xfer, usb_error_t error)
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) {

2
sys/dev/usb/net/if_cdce.c
View File

@ -641,7 +641,7 @@ cdce_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
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)

2
sys/dev/usb/serial/ufoma.c
View File

@ -571,7 +571,7 @@ ufoma_ctrl_read_callback(struct usb_xfer *xfer, usb_error_t error)
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 */

4
sys/dev/usb/usb_transfer.c
View File

@ -1805,7 +1805,7 @@ usbd_xfer_get_frame(struct usb_xfer *xfer, usb_frcount_t frindex)
}
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 *xfer, usb_frcount_t frindex,
}
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"));

4
sys/dev/usb/usbdi.h
View File

@ -469,14 +469,14 @@ void usbd_xfer_set_interval(struct usb_xfer *xfer, int);
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);

4
sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
View File

@ -1002,7 +1002,7 @@ ubt_isoc_read_one_frame(struct usb_xfer *xfer, int frame_no)
/* 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 @@ ubt_isoc_write_callback(struct usb_xfer *xfer, usb_error_t error)
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);