From owner-svn-src-all@FreeBSD.ORG  Thu Jan  6 19:17:29 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C62BF106566B;
	Thu,  6 Jan 2011 19:17:29 +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 B56888FC17;
	Thu,  6 Jan 2011 19:17:29 +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 p06JHTZZ025660;
	Thu, 6 Jan 2011 19:17:29 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p06JHTYK025657;
	Thu, 6 Jan 2011 19:17:29 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201101061917.p06JHTYK025657@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Thu, 6 Jan 2011 19:17:29 +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: r217061 - in head/sys/dev/usb: . serial
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2011 19:17:29 -0000

Author: gavin
Date: Thu Jan  6 19:17:29 2011
New Revision: 217061
URL: http://svn.freebsd.org/changeset/base/217061

Log:
  Support the Uniform Industrial Corp (UIC) MSR206 Magnetic Card Reader.
  
  MFC after:	1 week

Modified:
  head/sys/dev/usb/serial/uplcom.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/serial/uplcom.c
==============================================================================
--- head/sys/dev/usb/serial/uplcom.c	Thu Jan  6 18:23:36 2011	(r217060)
+++ head/sys/dev/usb/serial/uplcom.c	Thu Jan  6 19:17:29 2011	(r217061)
@@ -283,6 +283,7 @@ static const struct usb_device_id uplcom
 	UPLCOM_DEV(PROLIFIC, PL2303),		/* Generic adapter */
 	UPLCOM_DEV(PROLIFIC, RSAQ2),		/* I/O DATA USB-RSAQ2 */
 	UPLCOM_DEV(PROLIFIC, RSAQ3),		/* I/O DATA USB-RSAQ3 */
+	UPLCOM_DEV(PROLIFIC, UIC_MSR206),	/* UIC MSR206 Card Reader */
 	UPLCOM_DEV(PROLIFIC2, PL2303),		/* Prolific adapter */
 	UPLCOM_DEV(RADIOSHACK, USBCABLE),
 	UPLCOM_DEV(RATOC, REXUSB60),		/* RATOC REX-USB60 */

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Thu Jan  6 18:23:36 2011	(r217060)
+++ head/sys/dev/usb/usbdevs	Thu Jan  6 19:17:29 2011	(r217061)
@@ -2593,6 +2593,7 @@ product PROLIFIC ALLTRONIX_GPRS	0x0609	A
 product PROLIFIC ALDIGA_AL11U	0x0611	AlDiga AL-11U modem
 product PROLIFIC MICROMAX_610U	0x0612	Micromax 610U
 product PROLIFIC DCU11		0x1234	DCU-11 Phone Cable
+product PROLIFIC UIC_MSR206	0x206a	UIC MSR206 Card Reader
 product PROLIFIC PL2303		0x2303	PL2303 Serial (ATEN/IOGEAR UC232A)
 product PROLIFIC PL2305		0x2305	Parallel printer
 product PROLIFIC ATAPI4		0x2307	ATAPI-4 Controller