Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Jan 2011 23:05:30 +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: r217993 - in stable/8: share/man/man4 sys/dev/usb sys/dev/usb/serial
Message-ID:  <201101272305.p0RN5UJC042264@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gavin
Date: Thu Jan 27 23:05:29 2011
New Revision: 217993
URL: http://svn.freebsd.org/changeset/base/217993

Log:
  Merge r217061, r217274, r217275 from head:
  
  - Support the Uniform Industrial Corp (UIC) MSR206 Magnetic Card Reader.
  
  - Improve or fix some comments.
  
  - Update the uplcom(4) man page to reflect the devices currently supported by
    uplcom(4).

Modified:
  stable/8/share/man/man4/uplcom.4
  stable/8/sys/dev/usb/serial/uplcom.c
  stable/8/sys/dev/usb/usbdevs
Directory Properties:
  stable/8/share/man/man4/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (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)

Modified: stable/8/share/man/man4/uplcom.4
==============================================================================
--- stable/8/share/man/man4/uplcom.4	Thu Jan 27 23:04:16 2011	(r217992)
+++ stable/8/share/man/man4/uplcom.4	Thu Jan 27 23:05:29 2011	(r217993)
@@ -36,7 +36,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2006
+.Dd January 11, 2011
 .Dt UPLCOM 4
 .Os
 .Sh NAME
@@ -70,19 +70,35 @@ driver which makes it behave like a
 .Sh HARDWARE
 The
 .Nm
-driver supports the following adapters:
+driver supports the following devices and adapters:
 .Pp
 .Bl -bullet -compact
 .It
-ATEN UC-232A
+ADLINK ND-6530 USB-Serial Adapter
+.It
+Alcatel One Touch 535/735 Phone
+.It
+Alcor AU9720 USB-RS232 Serial Adapter
+.It
+AlDiga AL-11U Modem
+.It
+Alltronix ACM003U00 Modem
 .It
-BAFO BF-800
+Anchor Serial adapter
 .It
-BAFO BF-810
+ATEN UC-232A
+.It
+BAFO BF-800 and BF-810
 .It
 Belkin F5U257
 .It
-ELECOM UC-SGT
+BenQ S81 Phone
+.It
+Corega CG-USBRS232R Serial Adapter
+.It
+Cressi Edy (Seiko) Diving Computer
+.It
+ELECOM UC-SGT Serial Adapter
 .It
 HAL Corporation Crossam2+USB IR commander
 .It
@@ -90,29 +106,83 @@ Hama USB RS-232 Serial Adapter
 .It
 Hamlet exagerate XURS232
 .It
+HP LD220 Point-Of-Sale (POS) Display
+.It
 IOGEAR UC-232A
 .It
-I/O DATA USB-RSAQ
+I/O DATA USB-RSAQ, USB-RSAQ2, USB-RSAQ3 and USB-RSAQ5
+.It
+iTegno WM1080A GSM/GFPRS Modem
+.It
+iTegno WM2080A CDMA Modem
 .It
-I/O DATA USB-RSAQ2
+Leadtek 9531 GPS
 .It
-I/O DATA USB-RSAQ3
+Micromax 610U Modem
+.It
+Microsoft Palm 700WX
 .It
 Mobile Action MA-620 Infrared Adapter
 .It
+Nokia CA-42 Cable
+.It
+OTI DKU-5 cable
+.It
+Panasonic TY-TP50P6-S flat screen
+.It
+PLX CA-42 Phone Cable
+.It
 PLANEX USB-RS232 URS-03
 .It
+Prolific Generic USB-Serial Adapters
+.It
+Prolific Pharos USB-Serial Adapter
+.It
 RATOC REX-USB60
 .It
 Radio Shack USB Serial Cable
 .It
+Sagem USB-Serial Adapter
+.It
+Samsung I330 Phone Cradle
+.It
 Sandberg USB to Serial Link (model number 133-08)
 .It
+Sanwa KB-USB2 Multimeter cable
+.It
+Siemens/BenQ EF81, SX1, X65 and X75 Mobile Phones
+.It
+Sitecom USB-Serial Adapter
+.It
+SMART Technologies USB-Serial Adapter
+.It
+Sony QN3 Phone Cable
+.It
+Sony Ericsson Datapilot
+.It
+Sony Ericsson DCU-10 and DCU-11 (Susteen) USB Cables
+.It
 SOURCENEXT KeikaiDenwa 8 (with and without charger)
 .It
-Sony Ericsson USB Cable (Susteen USB Data Cable)
+Speed Dragon USB-Serial Cable
+.It
+Syntech CPT-8001C Barcode Scanner
+.It
+TDK UHA6400 and UPA9664 USB-PHS Adapters
+.It
+TRENDnet USB to Serial Converter (TU-S9)
+.It
+Tripp-Lite U209-000-R USB-Serial Adapter
+.It
+UIC HCR331 Magnetic Stripe Card Reader
+.It
+UIC MSR206 Magnetic Stripe Card Reader
 .It
 Willcom W-SIM DD PHS terminal.(WS002IN)
+.It
+YC-Cable USB-Serial Adapter
+.It
+Zeagle N2iTion3 Diving Computer
 .El
 .Sh SEE ALSO
 .Xr tty 4 ,

Modified: stable/8/sys/dev/usb/serial/uplcom.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uplcom.c	Thu Jan 27 23:04:16 2011	(r217992)
+++ stable/8/sys/dev/usb/serial/uplcom.c	Thu Jan 27 23:05:29 2011	(r217993)
@@ -255,11 +255,11 @@ static const struct usb_device_id uplcom
 	UPLCOM_DEV(ALCOR, AU9720),		/* Alcor AU9720 USB 2.0-RS232 */
 	UPLCOM_DEV(ANCHOR, SERIAL),		/* Anchor Serial adapter */
 	UPLCOM_DEV(ATEN, UC232A),		/* PLANEX USB-RS232 URS-03 */
-	UPLCOM_DEV(BELKIN, F5U257),		/* Belkin F5U257 */
+	UPLCOM_DEV(BELKIN, F5U257),		/* Belkin F5U257 USB to Serial */
 	UPLCOM_DEV(COREGA, CGUSBRS232R),	/* Corega CG-USBRS232R */
 	UPLCOM_DEV(EPSON, CRESSI_EDY),		/* Cressi Edy diving computer */
-	UPLCOM_DEV(ELECOM, UCSGT),		/* ELECOM UC-SGT */
-	UPLCOM_DEV(ELECOM, UCSGT0),		/* ELECOM UC-SGT */
+	UPLCOM_DEV(ELECOM, UCSGT),		/* ELECOM UC-SGT Serial Adapter */
+	UPLCOM_DEV(ELECOM, UCSGT0),		/* ELECOM UC-SGT Serial Adapter */
 	UPLCOM_DEV(HAL, IMR001),		/* HAL Corporation Crossam2+USB */
 	UPLCOM_DEV(HP, LD220),			/* HP LD220 POS Display */
 	UPLCOM_DEV(IODATA, USBRSAQ),		/* I/O DATA USB-RSAQ */
@@ -283,18 +283,19 @@ 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(RADIOSHACK, USBCABLE),	/* Radio Shack USB Adapter */
 	UPLCOM_DEV(RATOC, REXUSB60),		/* RATOC REX-USB60 */
 	UPLCOM_DEV(SAGEM, USBSERIAL),		/* Sagem USB-Serial Controller */
 	UPLCOM_DEV(SAMSUNG, I330),		/* Samsung I330 phone cradle */
 	UPLCOM_DEV(SANWA, KB_USB2),		/* Sanwa KB-USB2 Multimeter cable */
-	UPLCOM_DEV(SIEMENS3, EF81),		/* Seimens EF81 */
-	UPLCOM_DEV(SIEMENS3, SX1),		/* Seimens SX1 */
-	UPLCOM_DEV(SIEMENS3, X65),		/* Seimens X65 */
-	UPLCOM_DEV(SIEMENS3, X75),		/* Seimens X75 */
+	UPLCOM_DEV(SIEMENS3, EF81),		/* Siemens EF81 */
+	UPLCOM_DEV(SIEMENS3, SX1),		/* Siemens SX1 */
+	UPLCOM_DEV(SIEMENS3, X65),		/* Siemens X65 */
+	UPLCOM_DEV(SIEMENS3, X75),		/* Siemens X75 */
 	UPLCOM_DEV(SITECOM, SERIAL),		/* Sitecom USB to Serial */
-	UPLCOM_DEV(SMART, PL2303),		/* SMART Technologies */
+	UPLCOM_DEV(SMART, PL2303),		/* SMART Technologies USB to Serial */
 	UPLCOM_DEV(SONY, QN3),			/* Sony QN3 phone cable */
 	UPLCOM_DEV(SONYERICSSON, DATAPILOT),	/* Sony Ericsson Datapilot */
 	UPLCOM_DEV(SONYERICSSON, DCU10),	/* Sony Ericsson DCU-10 Cable */
@@ -304,7 +305,7 @@ static const struct usb_device_id uplcom
 	UPLCOM_DEV(SYNTECH, CPT8001C),		/* Syntech CPT-8001C Barcode scanner */
 	UPLCOM_DEV(TDK, UHA6400),		/* TDK USB-PHS Adapter UHA6400 */
 	UPLCOM_DEV(TDK, UPA9664),		/* TDK USB-PHS Adapter UPA9664 */
-	UPLCOM_DEV(TRIPPLITE, U209),		/* Tripp-Lite U209-000-R */
+	UPLCOM_DEV(TRIPPLITE, U209),		/* Tripp-Lite U209-000-R USB to Serial */
 	UPLCOM_DEV(YCCABLE, PL2303),		/* YC Cable USB-Serial */
 };
 #undef UPLCOM_DEV

Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs	Thu Jan 27 23:04:16 2011	(r217992)
+++ stable/8/sys/dev/usb/usbdevs	Thu Jan 27 23:05:29 2011	(r217993)
@@ -2599,6 +2599,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



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