summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2010-06-22 21:13:36 +0000
committerthompsa <thompsa@FreeBSD.org>2010-06-22 21:13:36 +0000
commitdf538682b552d82402963a79fd98799af1fbfcdf (patch)
tree6cf02114652eb013e1bf0324c7b0226f6b129231
parentd85631a5e387f1c1929c0289214236f7794f373f (diff)
downloadFreeBSD-src-df538682b552d82402963a79fd98799af1fbfcdf.zip
FreeBSD-src-df538682b552d82402963a79fd98799af1fbfcdf.tar.gz
Reduce MIDI input buffer size to one USB packet, hence some USB devices don't
properly short terminate their transfers. This fixes a problem where input appears several seconds late. Reported by: Alexander Yerenkow Submitted by: Hans Petter Selasky
-rw-r--r--sys/dev/sound/usb/uaudio.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 1613266..6ca6459 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -507,8 +507,8 @@ static const struct usb_config
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
- .bufsize = UMIDI_BULK_SIZE,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .bufsize = 4, /* bytes */
+ .flags = {.pipe_bof = 1,.short_xfer_ok = 1,.proxy_buffer = 1,},
.callback = &umidi_bulk_read_callback,
},
@@ -3366,10 +3366,6 @@ umidi_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
DPRINTF("actlen=%d bytes\n", actlen);
- if (actlen == 0) {
- /* should not happen */
- goto tr_error;
- }
pos = 0;
pc = usbd_xfer_get_frame(xfer, 0);
@@ -3404,8 +3400,6 @@ umidi_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
return;
default:
-tr_error:
-
DPRINTF("error=%s\n", usbd_errstr(error));
if (error != USB_ERR_CANCELLED) {
OpenPOWER on IntegriCloud