[src/netbsd-6]: src/sys/dev/usb Pull up the following revisions(s) (requested...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/37ced1337689
branches:  netbsd-6
changeset: 776560:37ced1337689
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Fri Feb 07 11:33:34 2014 +0000

description:
Pull up the following revisions(s) (requested by skrll in ticket #1015):
        sys/dev/usb/usb_subr.c: revision 1.190, 1.192

Fix PR/48496. Only set wMaxPacketSize to 64 for HS/FS and set to 8 for LS to be within
the USB spec.
Reload the full device descriptor after re-establishing the default pipe
with the new address.

diffstat:

 sys/dev/usb/usb_subr.c |  26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diffs (61 lines):

diff -r c40d19154009 -r 37ced1337689 sys/dev/usb/usb_subr.c
--- a/sys/dev/usb/usb_subr.c    Fri Feb 07 11:15:59 2014 +0000
+++ b/sys/dev/usb/usb_subr.c    Fri Feb 07 11:33:34 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb_subr.c,v 1.180 2011/06/09 19:08:33 matt Exp $      */
+/*     $NetBSD: usb_subr.c,v 1.180.8.1 2014/02/07 11:33:34 sborrill Exp $      */
 /*     $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $   */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.180 2011/06/09 19:08:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.180.8.1 2014/02/07 11:33:34 sborrill Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_usbverbose.h"
@@ -1103,7 +1103,11 @@
         * (which uses 64 bytes so it shouldn't be less),
         * highspeed devices must support 64 byte packets anyway
         */
-       USETW(dev->def_ep_desc.wMaxPacketSize, 64);
+       if (speed == USB_SPEED_HIGH || speed == USB_SPEED_FULL)
+               USETW(dev->def_ep_desc.wMaxPacketSize, 64);
+       else
+               USETW(dev->def_ep_desc.wMaxPacketSize, USB_MAX_IPACKET);
+
        dev->def_ep_desc.bInterval = 0;
 
        /* doesn't matter, just don't let it uninitialized */
@@ -1219,14 +1223,6 @@
        dev->address = addr;    /* new device address now */
        bus->devices[addr] = dev;
 
-       err = usbd_reload_device_desc(dev);
-       if (err) {
-               DPRINTFN(-1, ("usbd_new_device: addr=%d, getting full desc "
-                             "failed\n", addr));
-               usbd_remove_device(dev, up);
-               return (err);
-       }
-
        /* Re-establish the default pipe with the new address. */
        usbd_kill_pipe(dev->default_pipe);
        err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
@@ -1237,6 +1233,14 @@
                return err;
        }
 
+       err = usbd_reload_device_desc(dev);
+       if (err) {
+               DPRINTFN(-1, ("usbd_new_device: addr=%d, getting full desc "
+                             "failed\n", addr));
+               usbd_remove_device(dev, up);
+               return (err);
+       }
+
        /* Assume 100mA bus powered for now. Changed when configured. */
        dev->power = USB_MIN_POWER;
        dev->self_powered = 0;