Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb Restore parts of uhub_explore() needed to make u...



details:   https://anonhg.NetBSD.org/src/rev/9717a8343906
branches:  trunk
changeset: 777913:9717a8343906
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Mar 09 00:12:10 2012 +0000

description:
Restore parts of uhub_explore() needed to make usb_needs_reattach() work.

diffstat:

 sys/dev/usb/uhub.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r a19b9b17327b -r 9717a8343906 sys/dev/usb/uhub.c
--- a/sys/dev/usb/uhub.c        Thu Mar 08 22:52:22 2012 +0000
+++ b/sys/dev/usb/uhub.c        Fri Mar 09 00:12:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhub.c,v 1.115 2012/03/05 16:14:03 sborrill Exp $      */
+/*     $NetBSD: uhub.c,v 1.116 2012/03/09 00:12:10 jakllsch Exp $      */
 /*     $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $       */
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.115 2012/03/05 16:14:03 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.116 2012/03/09 00:12:10 jakllsch Exp $");
 
 #include "opt_usb.h"
 
@@ -464,8 +464,12 @@
 
                /* XXX handle overcurrent and resume events! */
 
-               if (!(change & UPS_C_CONNECT_STATUS))
+               if (!reconnect && !(change & UPS_C_CONNECT_STATUS)) {
+                       /* No status change, just do recursive explore. */
+                       if (up->device != NULL && up->device->hub != NULL)
+                               up->device->hub->explore(up->device);
                        continue;
+               }
 
                /* We have a connect status change, handle it. */
 



Home | Main Index | Thread Index | Old Index