From owner-svn-src-head@FreeBSD.ORG  Tue Dec 23 12:44:19 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08BCE1065678;
	Tue, 23 Dec 2008 12:44:19 +0000 (UTC)
	(envelope-from remko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB9898FC1D;
	Tue, 23 Dec 2008 12:44:18 +0000 (UTC)
	(envelope-from remko@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNCiIvv000907;
	Tue, 23 Dec 2008 12:44:18 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBNCiINB000905;
	Tue, 23 Dec 2008 12:44:18 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <200812231244.mBNCiINB000905@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Tue, 23 Dec 2008 12:44:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186427 - head/sys/dev/usb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2008 12:44:19 -0000

Author: remko
Date: Tue Dec 23 12:44:18 2008
New Revision: 186427
URL: http://svn.freebsd.org/changeset/base/186427

Log:
  Add support for the MaxSream USB test carrier.
  
  PR:		117546
  Submitted by:	Daniel J. O'Connor <darius at midget dot dons dot net
  dot au>
  MFC after:	1 week

Modified:
  head/sys/dev/usb/uftdi.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/uftdi.c
==============================================================================
--- head/sys/dev/usb/uftdi.c	Tue Dec 23 12:15:21 2008	(r186426)
+++ head/sys/dev/usb/uftdi.c	Tue Dec 23 12:44:18 2008	(r186427)
@@ -170,7 +170,8 @@ uftdi_match(device_t self)
 	     uaa->product == USB_PRODUCT_FTDI_UOPTBR ||
 	     uaa->product == USB_PRODUCT_FTDI_EMCU2D ||
 	     uaa->product == USB_PRODUCT_FTDI_PCMSFU ||
-	     uaa->product == USB_PRODUCT_FTDI_EMCU2H ))
+	     uaa->product == USB_PRODUCT_FTDI_EMCU2H ||
+	     uaa->product == USB_PRODUCT_FTDI_MAXSTREAM ))
 		return (UMATCH_VENDOR_PRODUCT);
 	if (uaa->vendor == USB_VENDOR_SIIG2 &&
 	    (uaa->product == USB_PRODUCT_SIIG2_US2308))
@@ -256,6 +257,7 @@ uftdi_attach(device_t self)
 		case USB_PRODUCT_FTDI_EMCU2D:
 		case USB_PRODUCT_FTDI_PCMSFU:
 		case USB_PRODUCT_FTDI_EMCU2H:
+		case USB_PRODUCT_FTDI_MAXSTREAM:
 			sc->sc_type = UFTDI_TYPE_8U232AM;
 			sc->sc_hdrlen = 0;
 			break;

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Tue Dec 23 12:15:21 2008	(r186426)
+++ head/sys/dev/usb/usbdevs	Tue Dec 23 12:44:18 2008	(r186427)
@@ -1280,6 +1280,7 @@ product FTDI UOPTBR		0xe889	USB-RS232 Op
 product FTDI EMCU2D		0xe88a	Expert mouseCLOCK USB II
 product FTDI PCMSFU		0xe88b	Precision Clock MSF USB
 product FTDI EMCU2H		0xe88c	Expert mouseCLOCK USB II HBG
+product	FTDI MAXSTREAM		0xee18	Maxstream PKG-U
 product FTDI USBSERIAL		0xfa00	Matrix Orbital USB Serial
 product FTDI MX2_3		0xfa01	Matrix Orbital MX2 or MX3
 product FTDI MX4_5		0xfa02	Matrix Orbital MX4 or MX5