6388141 Fix the CDDL block of usr/src/uts/intel/usbs49_fw/Makefile

6430189 Recovery mechanism fail to re-activate the USB port after the short circuit condition is cleared.
6440743 ohci should be able to handle clearing hub feature C_HUB_OVER_CURRENT
6443767 warlock usb is not clean due to changes made in 6426010

14 files changed, 128 insertions, 49 deletions

diff --git a/usr/src/uts/sparc/hid/hid_with_usba.wlcmd b/usr/src/uts/sparc/hid/hid_with_usba.wlcmd
index 7c198912fe..07fcab631e 100644
--- a/usr/src/uts/sparc/hid/hid_with_usba.wlcmd
+++ b/usr/src/uts/sparc/hid/hid_with_usba.wlcmd
@@ -34,6 +34,11 @@ one usba_device
 
 ### specify the root functions
 
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_read
@@ -189,3 +194,8 @@ add usba_hcdi_ops::usba_hcdi_console_input_init targets \
                                                 ehci_hcdi_polled_input_init
 add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
                                                 ehci_hcdi_polled_input_fini
+
+add usba_hcdi_ops::usba_hcdi_console_input_init targets \
+						uhci_hcdi_polled_input_init
+add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
+						uhci_hcdi_polled_input_fini
diff --git a/usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd b/usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd
index a91e4b1198..a6395b215e 100644
--- a/usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd
+++ b/usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd
@@ -36,6 +36,11 @@ one     sd_resv_reclaim_request
 ### specify the root functions
 
 root	usba_ascii_string_descr
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_input_fini
diff --git a/usr/src/uts/sparc/ugen/ugen_with_usba.wlcmd b/usr/src/uts/sparc/ugen/ugen_with_usba.wlcmd
index e5b7d4c828..bcca5504b9 100644
--- a/usr/src/uts/sparc/ugen/ugen_with_usba.wlcmd
+++ b/usr/src/uts/sparc/ugen/ugen_with_usba.wlcmd
@@ -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.
@@ -19,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,6 +33,11 @@ one usba_device
 
 ### specify the root functions
 
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_read
diff --git a/usr/src/uts/sparc/uhci/uhci.wlcmd b/usr/src/uts/sparc/uhci/uhci.wlcmd
index 1b52bfd409..ece559e66a 100644
--- a/usr/src/uts/sparc/uhci/uhci.wlcmd
+++ b/usr/src/uts/sparc/uhci/uhci.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -65,6 +64,11 @@ root   uhci_hcdi_polled_input_fini
 root   uhci_hcdi_polled_input_enter
 root   uhci_hcdi_polled_input_exit
 root   uhci_hcdi_polled_read
+root   uhci_hcdi_polled_output_init
+root   uhci_hcdi_polled_output_fini
+root   uhci_hcdi_polled_output_enter
+root   uhci_hcdi_polled_output_exit
+root   uhci_hcdi_polled_write
  
 ### currently unused functions
  
diff --git a/usr/src/uts/sparc/usb_ac/usb_ac_with_usba.wlcmd b/usr/src/uts/sparc/usb_ac/usb_ac_with_usba.wlcmd
index 7b9f601e4d..4b73a97ace 100644
--- a/usr/src/uts/sparc/usb_ac/usb_ac_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usb_ac/usb_ac_with_usba.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -34,6 +33,11 @@ one hubd
 one usba_device
 
 ### specify the root functions
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_input_fini
diff --git a/usr/src/uts/sparc/usb_as/usb_as_with_usba.wlcmd b/usr/src/uts/sparc/usb_as/usb_as_with_usba.wlcmd
index 7ce60bddc1..03650331a8 100644
--- a/usr/src/uts/sparc/usb_as/usb_as_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usb_as/usb_as_with_usba.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -31,7 +30,11 @@ one usb_as_state
 
 ### specify the root functions
 
-
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_input_fini
diff --git a/usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd b/usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd
index 3f00b92ddb..81b5c8fbd7 100644
--- a/usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -34,6 +33,11 @@ one usba_device
 ### specify the root functions
 
 root	usba_ascii_string_descr
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_input_fini
diff --git a/usr/src/uts/sparc/usbprn/usbprn_with_usba.wlcmd b/usr/src/uts/sparc/usbprn/usbprn_with_usba.wlcmd
index 05bd30a4e8..a83a0b3e29 100644
--- a/usr/src/uts/sparc/usbprn/usbprn_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usbprn/usbprn_with_usba.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -31,6 +30,11 @@ one usbprn_state
 
 ### specify the root functions
 
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_input_fini
diff --git a/usr/src/uts/sparc/usbser/usbser.wlcmd b/usr/src/uts/sparc/usbser/usbser.wlcmd
index a8944be2e9..5769e8365c 100644
--- a/usr/src/uts/sparc/usbser/usbser.wlcmd
+++ b/usr/src/uts/sparc/usbser/usbser.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -29,6 +28,12 @@ one usbser_state
 
 ### specify the root functions
 
+root usbser_first_device
+root usbser_putchar
+root usbser_getchar
+root usbser_ischar
+root usbser_polledio_enter
+root usbser_polledio_exit
 root usbser_soft_state_size
 root usbser_open
 root usbser_close
@@ -72,6 +77,8 @@ add        ds_ops::ds_stop targets warlock_dummy
 add        ds_ops::ds_start targets warlock_dummy
 add        ds_ops::ds_fifo_flush targets warlock_dummy
 add        ds_ops::ds_fifo_drain targets warlock_dummy
+add        ds_ops::ds_out_pipe targets warlock_dummy
+add        ds_ops::ds_in_pipe targets warlock_dummy
 
 add        rseq_step::s_func targets usbser_free_soft_state
 add        rseq_step::s_func targets usbser_init_soft_state
diff --git a/usr/src/uts/sparc/usbskel/usbskel_with_usba.wlcmd b/usr/src/uts/sparc/usbskel/usbskel_with_usba.wlcmd
index a807a4e911..a9d1f5632e 100644
--- a/usr/src/uts/sparc/usbskel/usbskel_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usbskel/usbskel_with_usba.wlcmd
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # 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.
@@ -35,6 +34,11 @@ one usba_device
 
 ### specify the root functions
 
+root	usb_console_output_init
+root	usb_console_output_fini
+root	usb_console_output_enter
+root	usb_console_output_exit
+root	usb_console_write
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_read
diff --git a/usr/src/uts/sparc/usbsksp/usbser_keyspan.wlcmd b/usr/src/uts/sparc/usbsksp/usbser_keyspan.wlcmd
index 9e8b5def09..695e365565 100644
--- a/usr/src/uts/sparc/usbsksp/usbser_keyspan.wlcmd
+++ b/usr/src/uts/sparc/usbsksp/usbser_keyspan.wlcmd
@@ -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.
@@ -21,7 +20,7 @@
 #
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -34,6 +33,12 @@ one keyspan_port
 
 ### specify the root functions
 
+root usbser_first_device
+root usbser_putchar
+root usbser_getchar
+root usbser_ischar
+root usbser_polledio_enter
+root usbser_polledio_exit
 root usbser_soft_state_size
 root usbser_keyspan_open
 root usbser_close
@@ -78,6 +83,8 @@ add        ds_ops::ds_stop targets keyspan_stop
 add        ds_ops::ds_start targets keyspan_start
 add        ds_ops::ds_fifo_flush targets keyspan_fifo_flush
 add        ds_ops::ds_fifo_drain targets keyspan_fifo_drain
+add        ds_ops::ds_out_pipe targets warlock_dummy
+add        ds_ops::ds_in_pipe targets warlock_dummy
 
 add        keyspan_port::kp_cb.cb_tx targets usbser_tx_cb
 add        keyspan_port::kp_cb.cb_rx targets usbser_rx_cb
diff --git a/usr/src/uts/sparc/usbsksp/usbser_keyspan_with_usba.wlcmd b/usr/src/uts/sparc/usbsksp/usbser_keyspan_with_usba.wlcmd
index 24d6fc20a4..112b657387 100644
--- a/usr/src/uts/sparc/usbsksp/usbser_keyspan_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usbsksp/usbser_keyspan_with_usba.wlcmd
@@ -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.
@@ -21,7 +20,7 @@
 #
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -37,6 +36,13 @@ one keyspan_port
 
 ### specify the root functions
 
+root	usbser_first_device
+root	usbser_putchar
+root	usbser_getchar
+root	usbser_ischar
+root	usbser_polledio_enter
+root	usbser_polledio_exit
+root	usb_console_output_fini
 root	usb_console_input_enter
 root	usb_console_input_exit
 root	usb_console_input_fini
@@ -185,6 +191,8 @@ add        ds_ops::ds_stop targets keyspan_stop
 add        ds_ops::ds_start targets keyspan_start
 add        ds_ops::ds_fifo_flush targets keyspan_fifo_flush
 add        ds_ops::ds_fifo_drain targets keyspan_fifo_drain
+add        ds_ops::ds_out_pipe targets warlock_dummy
+add        ds_ops::ds_in_pipe targets warlock_dummy
 
 add        keyspan_port::kp_cb.cb_tx targets usbser_tx_cb
 add        keyspan_port::kp_cb.cb_rx targets usbser_rx_cb
diff --git a/usr/src/uts/sparc/usbsprl/usbsprl.wlcmd b/usr/src/uts/sparc/usbsprl/usbsprl.wlcmd
index 2088241cbe..a8e584397c 100644
--- a/usr/src/uts/sparc/usbsprl/usbsprl.wlcmd
+++ b/usr/src/uts/sparc/usbsprl/usbsprl.wlcmd
@@ -1,9 +1,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.
@@ -18,7 +17,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,6 +27,12 @@ one pl2303_state
 
 ### specify the root functions
 
+root usbser_first_device
+root usbser_putchar
+root usbser_getchar
+root usbser_ischar
+root usbser_polledio_enter
+root usbser_polledio_exit
 root usbser_soft_state_size
 root usbser_pl2303_open
 root usbser_close
@@ -70,6 +75,8 @@ add ds_ops::ds_stop targets pl2303_stop
 add ds_ops::ds_start targets pl2303_start
 add ds_ops::ds_fifo_flush targets pl2303_fifo_flush
 add ds_ops::ds_fifo_drain targets pl2303_fifo_drain
+add ds_ops::ds_out_pipe targets pl2303_out_pipe
+add ds_ops::ds_in_pipe targets pl2303_in_pipe
 
 add pl2303_state::pl_cb.cb_tx targets usbser_tx_cb
 add pl2303_state::pl_cb.cb_rx targets usbser_rx_cb
diff --git a/usr/src/uts/sparc/usbsprl/usbsprl_with_usba.wlcmd b/usr/src/uts/sparc/usbsprl/usbsprl_with_usba.wlcmd
index 393e25032d..35a1af6283 100644
--- a/usr/src/uts/sparc/usbsprl/usbsprl_with_usba.wlcmd
+++ b/usr/src/uts/sparc/usbsprl/usbsprl_with_usba.wlcmd
@@ -1,9 +1,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.
@@ -18,7 +17,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,6 +30,13 @@ one pl2303_state
 
 ### specify the root functions
 
+root usbser_first_device
+root usbser_putchar
+root usbser_getchar
+root usbser_ischar
+root usbser_polledio_enter
+root usbser_polledio_exit
+root usb_console_output_fini
 root usb_console_input_enter
 root usb_console_input_exit
 root usb_console_input_fini
@@ -177,6 +183,8 @@ add ds_ops::ds_stop targets pl2303_stop
 add ds_ops::ds_start targets pl2303_start
 add ds_ops::ds_fifo_flush targets pl2303_fifo_flush
 add ds_ops::ds_fifo_drain targets pl2303_fifo_drain
+add ds_ops::ds_out_pipe targets pl2303_out_pipe
+add ds_ops::ds_in_pipe targets pl2303_in_pipe
 
 add pl2303_state::pl_cb.cb_tx targets usbser_tx_cb
 add pl2303_state::pl_cb.cb_rx targets usbser_rx_cb