Mercurial > illumos > illumos-gate

changeset 4000:282750a23d97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6525848 ELECOM UC-SGT and IO DATA USB-RSAQ3 should be supported. 6534667 REG: acomp failed for usb_ac.c in Solaris ON (s11_60) debug build in mars b43.0 on sparc
author lg150142
date Mon, 09 Apr 2007 19:26:23 -0700
parents 666384b31577
children 4d632d6bcf85
files usr/src/pkgdefs/SUNWuprl/postinstall usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac.c usr/src/uts/common/io/usb/clients/audio/usb_as/usb_as.c usr/src/uts/common/io/usb/clients/usbser/usbsprl/pl2303_dsd.c usr/src/uts/common/sys/usb/clients/usbser/usbsprl/pl2303_vendor.h
diffstat 5 files changed, 29 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/pkgdefs/SUNWuprl/postinstall	Mon Apr 09 17:13:22 2007 -0700
+++ b/usr/src/pkgdefs/SUNWuprl/postinstall	Mon Apr 09 19:26:23 2007 -0700
@@ -3,9 +3,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.
@@ -23,7 +22,7 @@
 #
 #pragma 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.
 #
  
@@ -45,10 +44,14 @@
 EXIT=0
 
 # "usb67b,2303" Most adapters based on pl2303 chip set have this ID
+# "usb67b,aaa2" IO DATA USB-RSAQ3 USB serial adapter
+# "usb56e,5004" ELECOM UC-SGT USB serial adapter
 # "usb557,2008" Aten UC-232A USB serial adapter
 # "usb6189,2068" Sitecom CN-104 USB serial adapter
 USBSPRL_ALIASES="\
 	\"usb67b,2303\" \
+	\"usb67b,aaa2\" \
+	\"usb56e,5004\" \
 	\"usb557,2008\" \
 	\"usb6189,2068\" \
 	"
--- a/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac.c	Mon Apr 09 17:13:22 2007 -0700
+++ b/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac.c	Mon Apr 09 19:26:23 2007 -0700
@@ -1736,14 +1736,12 @@
 
 	USB_DPRINTF_L3(PRINT_MASK_ATTA, uacp->usb_ac_log_handle,
 	    "header: type=0x%x subtype=0x%x bcdADC=0x%x\n\t"
-	    "total=0x%x InCol=0x%x interfaceno: 0x%x 0x%x 0x%x 0x%x",
+	    "total=0x%x InCol=0x%x",
 	    descr.bDescriptorType,
 	    descr.bDescriptorSubType,
 	    descr.bcdADC,
 	    descr.wTotalLength,
-	    descr.blnCollection,
-	    descr.baInterfaceNr[0], descr.baInterfaceNr[1],
-	    descr.baInterfaceNr[2], descr.baInterfaceNr[3]);
+	    descr.blnCollection);
 
 	/*
 	 * we read descriptors by index and store them in ID array.
@@ -2189,13 +2187,9 @@
 		USB_DPRINTF_L3(PRINT_MASK_ATTA,
 		    uacp->usb_ac_log_handle,
 		    "feature unit: type=0x%x sub=0x%x unitid=0x%x\n\t"
-		    "sourceid=0x%x size=0x%x "
-		    "controls=0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
+		    "sourceid=0x%x size=0x%x",
 		    d->bDescriptorType, d->bDescriptorSubType,
-		    d->bUnitID, d->bSourceID,
-		    d->bControlSize, d->bmaControls[0],
-		    d->bmaControls[1], d->bmaControls[2], d->bmaControls[3],
-		    d->bmaControls[4], d->bmaControls[5], d->bmaControls[6]);
+		    d->bUnitID, d->bSourceID, d->bControlSize);
 
 		usb_ac_alloc_unit(uacp, d->bUnitID);
 		uacp->usb_ac_units[d->bUnitID].acu_descriptor = descr;
--- a/usr/src/uts/common/io/usb/clients/audio/usb_as/usb_as.c	Mon Apr 09 17:13:22 2007 -0700
+++ b/usr/src/uts/common/io/usb/clients/audio/usb_as/usb_as.c	Mon Apr 09 19:26:23 2007 -0700
@@ -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 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -2596,15 +2595,6 @@
 		    format->bSubFrameSize,
 		    format->bBitResolution,
 		    format->bSamFreqType);
-		USB_DPRINTF_L3(PRINT_MASK_ATTA, uasp->usb_as_log_handle,
-		    "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x "
-		    "0x%x 0x%x 0x%x 0x%x",
-		    format->bSamFreqs[0], format->bSamFreqs[1],
-		    format->bSamFreqs[2], format->bSamFreqs[3],
-		    format->bSamFreqs[4], format->bSamFreqs[5],
-		    format->bSamFreqs[6], format->bSamFreqs[7],
-		    format->bSamFreqs[8], format->bSamFreqs[9],
-		    format->bSamFreqs[10], format->bSamFreqs[11]);
 
 		if (format->bSamFreqType == 0) {
 			/* continuous sample rate limits */
--- a/usr/src/uts/common/io/usb/clients/usbser/usbsprl/pl2303_dsd.c	Mon Apr 09 17:13:22 2007 -0700
+++ b/usr/src/uts/common/io/usb/clients/usbser/usbsprl/pl2303_dsd.c	Mon Apr 09 19:26:23 2007 -0700
@@ -241,7 +241,7 @@
 	}
 
 	mutex_init(&plp->pl_mutex, NULL, MUTEX_DRIVER,
-			plp->pl_dev_data->dev_iblock_cookie);
+	    plp->pl_dev_data->dev_iblock_cookie);
 
 	cv_init(&plp->pl_tx_cv, NULL, CV_DRIVER, NULL);
 
@@ -258,7 +258,7 @@
 		plp->pl_chiptype = pl2303_H;
 		mutex_exit(&plp->pl_mutex);
 		USB_DPRINTF_L3(DPRINT_ATTACH, plp->pl_lh,
-			"Chip Type: pl2303_H");
+		    "Chip Type: pl2303_H");
 	} else if (plp->pl_dev_data->dev_descr->bcdDevice == PROLIFIC_REV_X) {
 		/*
 		 * pl2303_HX(Chip A)and pl2303_X devices have different
@@ -272,20 +272,27 @@
 		plp->pl_chiptype = pl2303_X;
 		mutex_exit(&plp->pl_mutex);
 		USB_DPRINTF_L3(DPRINT_ATTACH, plp->pl_lh,
-			"Chip Type: pl2303_HX(Chip A) or pl2303_X");
+		    "Chip Type: pl2303_HX(Chip A) or pl2303_X");
 	} else if (plp->pl_dev_data->dev_descr->bcdDevice ==
-			PROLIFIC_REV_HX_CHIP_D) {
+	    PROLIFIC_REV_HX_CHIP_D) {
 		mutex_enter(&plp->pl_mutex);
 		plp->pl_chiptype = pl2303_HX_CHIP_D;
 		mutex_exit(&plp->pl_mutex);
 		USB_DPRINTF_L3(DPRINT_ATTACH, plp->pl_lh,
-			"Chip Type: pl2303_HX(Chip D)");
+		    "Chip Type: pl2303_HX(Chip D)");
+	} else if (plp->pl_dev_data->dev_descr->bcdDevice == PROLIFIC_REV_1) {
+		/* IO DATA USB-RSAQ3(usb67b,aaa2) uses pl2303_X chip */
+		mutex_enter(&plp->pl_mutex);
+		plp->pl_chiptype = pl2303_X;
+		mutex_exit(&plp->pl_mutex);
+		USB_DPRINTF_L3(DPRINT_ATTACH, plp->pl_lh,
+		    "Chip Type: pl2303_X with revison number=1");
 	} else {
 		mutex_enter(&plp->pl_mutex);
 		plp->pl_chiptype = pl2303_UNKNOWN;
 		mutex_exit(&plp->pl_mutex);
 		USB_DPRINTF_L3(DPRINT_ATTACH, plp->pl_lh,
-			"Chip Type: Unknown");
+		    "Chip Type: Unknown");
 	}
 
 	plp->pl_def_ph = plp->pl_dev_data->dev_default_ph;
--- a/usr/src/uts/common/sys/usb/clients/usbser/usbsprl/pl2303_vendor.h	Mon Apr 09 17:13:22 2007 -0700
+++ b/usr/src/uts/common/sys/usb/clients/usbser/usbsprl/pl2303_vendor.h	Mon Apr 09 19:26:23 2007 -0700
@@ -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.
  */
 
@@ -44,6 +44,7 @@
 #define	PROLIFIC_REV_H				0x0202
 #define	PROLIFIC_REV_X				0x0300
 #define	PROLIFIC_REV_HX_CHIP_D			0x0400
+#define	PROLIFIC_REV_1				0x0001
 
 /*
  * Vendor-specific Requests