From owner-svn-src-stable@FreeBSD.ORG Thu Aug 19 07:54:15 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCBD110656A5; Thu, 19 Aug 2010 07:54:15 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 911698FC1E; Thu, 19 Aug 2010 07:54:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7J7sFP8094421; Thu, 19 Aug 2010 07:54:15 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7J7sFWb094418; Thu, 19 Aug 2010 07:54:15 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201008190754.o7J7sFWb094418@svn.freebsd.org> From: Gavin Atkinson Date: Thu, 19 Aug 2010 07:54:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211491 - stable/7/sys/dev/usb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 07:54:15 -0000 Author: gavin Date: Thu Aug 19 07:54:15 2010 New Revision: 211491 URL: http://svn.freebsd.org/changeset/base/211491 Log: Merge r208016 from head: Add new FTDI USB device ID for the Gamma-Scout radioactivity meter. [1] Merge r210556 from head: Support the Pyramid KBS USB LCD under uftdi(4) [2] PR: kern/146483 [1] usb/129758 [2] Submitted by: Andre Albsmeier [1] Submitted by: joao lima [2] Modified: stable/7/sys/dev/usb/uftdi.c stable/7/sys/dev/usb/usbdevs Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/usb/uftdi.c ============================================================================== --- stable/7/sys/dev/usb/uftdi.c Thu Aug 19 06:11:06 2010 (r211490) +++ stable/7/sys/dev/usb/uftdi.c Thu Aug 19 07:54:15 2010 (r211491) @@ -165,6 +165,8 @@ uftdi_match(device_t self) uaa->product == USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M || uaa->product == USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S || uaa->product == USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U || + uaa->product == USB_PRODUCT_FTDI_GAMMASCOUT || + uaa->product == USB_PRODUCT_FTDI_KBS || uaa->product == USB_PRODUCT_FTDI_EISCOU || uaa->product == USB_PRODUCT_FTDI_UOPTBR || uaa->product == USB_PRODUCT_FTDI_EMCU2D || Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Thu Aug 19 06:11:06 2010 (r211490) +++ stable/7/sys/dev/usb/usbdevs Thu Aug 19 07:54:15 2010 (r211491) @@ -1303,6 +1303,8 @@ product FTDI SERIAL_2232C 0x6010 FT2232C product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal +product FTDI GAMMASCOUT 0xd678 Gamma-Scout +product FTDI KBS 0xe6c8 Pyramid KBS USB LCD product FTDI EISCOU 0xe888 Expert ISDN Control USB product FTDI UOPTBR 0xe889 USB-RS232 OptoBridge product FTDI EMCU2D 0xe88a Expert mouseCLOCK USB II