Author: thompsa
Date: Fri Nov 19 01:30:23 2010
New Revision: 215483
URL: http://svn.freebsd.org/changeset/base/215483

Log:
  MFC r209450
  
   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

Modified:
  stable/8/sys/dev/sound/usb/uaudio.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/sound/usb/uaudio.c
==============================================================================
--- stable/8/sys/dev/sound/usb/uaudio.c Fri Nov 19 01:29:20 2010        
(r215482)
+++ stable/8/sys/dev/sound/usb/uaudio.c Fri Nov 19 01:30:23 2010        
(r215483)
@@ -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
 
                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
                return;
 
        default:
-tr_error:
-
                DPRINTF("error=%s\n", usbd_errstr(error));
 
                if (error != USB_ERR_CANCELLED) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to