Mercurial > illumos > illumos-gate

changeset 3435:416cce5aa7c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6488108 The L0 and L1 level of debug info in usb codes need to re-check. 6493292 ldterm and ttcompat need to be autopushed above usb serial drivers
author lg150142
date Wed, 17 Jan 2007 19:50:55 -0800
parents 5142e1d7d0bc
children a538ac45855b
files usr/src/cmd/netadm/iu.ap.sh usr/src/pkgdefs/common_files/i.iuap usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac_dacf.c usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c usr/src/uts/common/io/usb/hcd/openhci/ohci.c usr/src/uts/common/io/usb/hcd/uhci/uhci.c usr/src/uts/common/io/usb/usba/hubdi.c usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h
diffstat 8 files changed, 28 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/netadm/iu.ap.sh	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/cmd/netadm/iu.ap.sh	Wed Jan 17 19:50:55 2007 -0800
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
@@ -39,6 +39,9 @@
 	asy	-1	0	ldterm ttcompat
 	ptsl	0	47	ldterm ttcompat
 	usbsacm -1	0	ldterm ttcompat
+	usbser_edge	-1	0	ldterm ttcompat
+	usbsprl	-1	0	ldterm ttcompat
+	usbsksp	-1	0	ldterm ttcompat
 	rts	-1	0	rts [anchor]
 	ipsecesp -1	0	ipsecesp
 	ipsecah	-1	0	ipsecah
@@ -67,6 +70,8 @@
 	su	131072	131073	ldterm ttcompat
 	usbser_edge -1	0	ldterm ttcompat
 	usbsacm -1	0	ldterm ttcompat
+	usbsprl -1	0	ldterm ttcompat
+	usbsksp -1	0	ldterm ttcompat
 	rts	-1	0	rts [anchor]
 	ttymux	-1	0	ldterm ttcompat
 	ipsecesp -1	0	ipsecesp
--- a/usr/src/pkgdefs/common_files/i.iuap	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/pkgdefs/common_files/i.iuap	Wed Jan 17 19:50:55 2007 -0800
@@ -22,7 +22,7 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -71,6 +71,8 @@
 		add_driver_replace su
 		add_driver usbser_edge
 		add_driver usbsacm
+		add_driver usbsprl
+		add_driver usbsksp
 		add_driver_replace rts
 		add_driver ipsecah
 		add_driver ipsecesp
--- a/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac_dacf.c	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac_dacf.c	Wed Jan 17 19:50:55 2007 -0800
@@ -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 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -725,7 +724,7 @@
 
 	/* Haven't found a streaming interface; fail mixer registration */
 	if (n > USB_AC_MAX_AS_PLUMBED) {
-		USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle,
+		USB_DPRINTF_L2(PRINT_MASK_ATTA, uacp->usb_ac_log_handle,
 		    "no streaming interface");
 
 		return (USB_FAILURE);
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c	Wed Jan 17 19:50:55 2007 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -707,7 +707,7 @@
 	if (ehci_is_polled(ehcip->ehci_dip)) {
 		extern pri_t maxclsyspri;
 
-		USB_DPRINTF_L1(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
+		USB_DPRINTF_L2(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
 		    "ehci_register_intrs_and_init_mutex: "
 		    "running in simulated polled mode");
 
@@ -3707,7 +3707,7 @@
 		Set_OpRegRetry(ehci_async_list_addr, (uint32_t)
 			ehci_save_regs->ehci_async_list_addr, retry);
 		if (retry >= EHCI_MAX_RETRY) {
-			USB_DPRINTF_L0(PRINT_MASK_ATTA,
+			USB_DPRINTF_L2(PRINT_MASK_ATTA,
 			    ehcip->ehci_log_hdl, "ehci_do_soft_reset:"
 			    " ASYNCLISTADDR write failed.");
 
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci.c	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci.c	Wed Jan 17 19:50:55 2007 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1244,7 +1244,7 @@
 	if (ohci_is_polled(ohcip->ohci_dip)) {
 		extern pri_t maxclsyspri;
 
-		USB_DPRINTF_L1(PRINT_MASK_ATTA, ohcip->ohci_log_hdl,
+		USB_DPRINTF_L2(PRINT_MASK_ATTA, ohcip->ohci_log_hdl,
 		    "ohci_register_intrs_and_init_mutex: "
 		    "running in simulated polled mode");
 
@@ -1620,9 +1620,8 @@
 		    ohcip->ohci_frame_interval))) {
 			if (retry >= 10) {
 				USB_DPRINTF_L1(PRINT_MASK_ATTA,
-				    ohcip->ohci_log_hdl, "ohci_init_ctlr:"
-				    " Failed to program Frame"
-				    " Interval Register, giving up.");
+				    ohcip->ohci_log_hdl, "Failed to program"
+				    " Frame Interval Register.");
 
 				return (DDI_FAILURE);
 			}
--- a/usr/src/uts/common/io/usb/hcd/uhci/uhci.c	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/uts/common/io/usb/hcd/uhci/uhci.c	Wed Jan 17 19:50:55 2007 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -363,7 +363,7 @@
 	if (polled) {
 		extern pri_t maxclsyspri;
 
-		USB_DPRINTF_L1(PRINT_MASK_ATTA, uhcip->uhci_log_hdl,
+		USB_DPRINTF_L2(PRINT_MASK_ATTA, uhcip->uhci_log_hdl,
 		    "uhci_attach: running in simulated polled mode.");
 
 		/* create thread to poll */
--- a/usr/src/uts/common/io/usb/usba/hubdi.c	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/uts/common/io/usb/usba/hubdi.c	Wed Jan 17 19:50:55 2007 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1970,7 +1970,7 @@
 	{
 		char *pathname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
 
-		USB_DPRINTF_L0(DPRINT_MASK_ATTA, hubdi_log_handle,
+		USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubdi_log_handle,
 		    "cannot attach %s", ddi_pathname(dip, pathname));
 
 		kmem_free(pathname, MAXPATHLEN);
@@ -8073,7 +8073,7 @@
 			if (!phubd->h_ignore_pwr_budget) {
 				mutex_enter(HUBD_MUTEX(phubd));
 				if (phubd->h_local_pwr_on == B_FALSE) {
-					USB_DPRINTF_L0(DPRINT_MASK_HUB,
+					USB_DPRINTF_L1(DPRINT_MASK_HUB,
 					    hubd->h_log_handle,
 					    "two bus-powered hubs cannot "
 					    "be concatenated");
@@ -8177,7 +8177,7 @@
 	    pwr_required, config_index);
 
 	if (pwr_required > pwr_limit) {
-		USB_DPRINTF_L0(DPRINT_MASK_HOTPLUG, hubd->h_log_handle,
+		USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle,
 		    "configuration %d for device %s %s at port %d "
 		    "exceeds power available for this port, please "
 		    "re-insert your device into another hub port which "
--- a/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h	Wed Jan 17 18:01:29 2007 -0800
+++ b/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h	Wed Jan 17 19:50:55 2007 -0800
@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -417,7 +417,7 @@
 /* print a panic sync message to the console */
 #define	SCSA2USB_PRINT_SYNC_MSG(m, s) \
 	if ((m) == B_TRUE) { \
-		USB_DPRINTF_L0(DPRINT_MASK_SCSA, (s)->scsa2usb_log_handle, \
+		USB_DPRINTF_L1(DPRINT_MASK_SCSA, (s)->scsa2usb_log_handle, \
 		    "syncing not supported"); \
 		(m) = B_FALSE; \
 	}