Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Aug 2010 21:39:42 +0000 (UTC)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r211471 - in stable/8/sys/dev/usb: . serial
Message-ID:  <201008182139.o7ILdg1E081111@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gavin
Date: Wed Aug 18 21:39:42 2010
New Revision: 211471
URL: http://svn.freebsd.org/changeset/base/211471

Log:
  Merge r210556 from head:
    Support the Pyramid KBS USB LCD under uftdi(4)
  
  PR:		usb/129758
  Submitted by:	joao lima <jlima visionware.pt>

Modified:
  stable/8/sys/dev/usb/serial/uftdi.c
  stable/8/sys/dev/usb/usbdevs
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/usb/serial/uftdi.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uftdi.c	Wed Aug 18 21:17:57 2010	(r211470)
+++ stable/8/sys/dev/usb/serial/uftdi.c	Wed Aug 18 21:39:42 2010	(r211471)
@@ -233,6 +233,7 @@ static struct usb_device_id uftdi_devs[]
 	UFTDI_DEV(FTDI, CFA_634, 8U232AM),
 	UFTDI_DEV(FTDI, CFA_635, 8U232AM),
 	UFTDI_DEV(FTDI, USBSERIAL, 8U232AM),
+	UFTDI_DEV(FTDI, KBS, 8U232AM),
 	UFTDI_DEV(FTDI, MX2_3, 8U232AM),
 	UFTDI_DEV(FTDI, MX4_5, 8U232AM),
 	UFTDI_DEV(FTDI, LK202, 8U232AM),

Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs	Wed Aug 18 21:17:57 2010	(r211470)
+++ stable/8/sys/dev/usb/usbdevs	Wed Aug 18 21:39:42 2010	(r211471)
@@ -1554,6 +1554,7 @@ product FTDI TACTRIX_OPENPORT_13M 0xcc48
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008182139.o7ILdg1E081111>