summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgc161489 <none@none>2006-07-10 19:03:08 -0700
committergc161489 <none@none>2006-07-10 19:03:08 -0700
commit7cf28e5665e98309f12252085598b2cfcd950772 (patch)
tree9407870a3755d35fa1ba6ce474517afe82825d86
parentcd3bce3e1981250fe9793d5d51d701e9c54d2fee (diff)
downloadillumos-gate-7cf28e5665e98309f12252085598b2cfcd950772.tar.gz
6412476 Front USB hub intializes to USB 1.x full speed on ohci rather than USB 2.0 hi speed on EHCI
-rw-r--r--usr/src/uts/common/io/usb/hcd/ehci/ehci_hub.c2
-rw-r--r--usr/src/uts/common/sys/usb/hcd/ehci/ehci_hub.h9
2 files changed, 5 insertions, 6 deletions
diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_hub.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_hub.c
index 8898a7b267..34724db2b6 100644
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_hub.c
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_hub.c
@@ -1000,7 +1000,7 @@ ehci_handle_port_reset(
mutex_exit(&ehcip->ehci_int_mutex);
- /* Wait 10ms for reset to complete */
+ /* Wait 20ms for reset to complete */
delay(drv_usectohz(EHCI_PORT_RESET_TIMEWAIT));
mutex_enter(&ehcip->ehci_int_mutex);
diff --git a/usr/src/uts/common/sys/usb/hcd/ehci/ehci_hub.h b/usr/src/uts/common/sys/usb/hcd/ehci/ehci_hub.h
index ac0920d4e4..50e784a569 100644
--- a/usr/src/uts/common/sys/usb/hcd/ehci/ehci_hub.h
+++ b/usr/src/uts/common/sys/usb/hcd/ehci/ehci_hub.h
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -102,7 +101,7 @@ typedef struct ehci_root_hub {
* These timeout values are specified in terms of microseconds.
*/
#define EHCI_RH_POLL_TIME 30000 /* RH polling interval */
-#define EHCI_PORT_RESET_TIMEWAIT 10000 /* RH port reset time */
+#define EHCI_PORT_RESET_TIMEWAIT 20000 /* RH port reset time */
#define EHCI_PORT_RESET_COMP_TIMEWAIT 2000 /* RH port reset complete */
#define EHCI_PORT_SUSPEND_TIMEWAIT 10000 /* RH port suspend time */
#define EHCI_PORT_RESUME_TIMEWAIT 20000 /* RH port resume time */