From 6895167db7028d4b339801a69819addfbd28a708 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 14 Mar 2014 22:40:48 +0100 Subject: [PATCH 1/1] Sync ucom.4, uplcom.4 and uslcom.4 with FreeBSD. --- gnu/usr.bin/groff/tmac/mdoc.local | 1 + share/man/man4/ucom.4 | 42 +++++--- share/man/man4/uplcom.4 | 124 +++++++++++++---------- share/man/man4/uslcom.4 | 159 +++++++++++++++++++++++++----- 4 files changed, 239 insertions(+), 87 deletions(-) diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 559d771994..3417da71d5 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -90,6 +90,7 @@ .ds doc-operating-system-DragonFly-3.1 3.1 .ds doc-operating-system-DragonFly-3.3 3.3 .ds doc-operating-system-DragonFly-3.5 3.5 +.ds doc-operating-system-DragonFly-3.6 3.6 .ds doc-operating-system-DragonFly-3.7 3.7 . .\" FreeBSD releases not found in doc-common. diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4 index 43195bb9d3..acfec2f028 100644 --- a/share/man/man4/ucom.4 +++ b/share/man/man4/ucom.4 @@ -14,13 +14,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgment: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -34,9 +27,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.2.2.2 2002/08/12 20:32:05 joe Exp $ +.\" $FreeBSD: head/share/man/man4/ucom.4 222696 2011-06-04 20:40:24Z hselasky $ .\" -.Dd November 25, 1999 +.Dd March 14, 2014 .Dt UCOM 4 .Os .Sh NAME @@ -44,7 +37,7 @@ .Nd USB tty support .Sh SYNOPSIS To compile this driver into the kernel, -place the following lines in your +place the following line in your kernel configuration file: .Bd -ragged -offset indent .Cd "device ucom" @@ -68,26 +61,37 @@ driver shows a behavior like a This means that normal programs such as .Xr tip 1 or -.Xr pppd 8 +.Xr ppp 8 can be used to access the device. +.Pp +The +.Va portno +locater can be used to decide which port to use for devices that have +multiple external ports. .Sh FILES -.Bl -tag -width ".Pa /dev/ucom?" -.It Pa /dev/ucom? +.Bl -tag -width ".Pa /dev/cuaU?" +.It Pa /dev/cuaU? +.It Pa /dev/ttyU? .El .Sh SEE ALSO -.Xr moscom 4 , .Xr tty 4 , +.Xr u3g 4 , .Xr uark 4 , .Xr ubsa 4 , +.Xr ubser 4 , .Xr uchcom 4 , +.Xr ucycom 4 , +.Xr ufoma 4 , .Xr uftdi 4 , .Xr ugensa 4 , +.Xr uipaq 4 , +.Xr umcs 4 , .Xr umct 4 , .Xr umodem 4 , +.Xr umoscom 4 , .Xr uplcom 4 , .Xr usb 4 , .Xr uslcom 4 , -.Xr uticom 4 , .Xr uvisor 4 , .Xr uvscom 4 .Sh HISTORY @@ -101,3 +105,11 @@ This manual page was adopted from by .An Tom Rhodes Aq Mt trhodes@FreeBSD.org in April 2002. +.Sh CAVEATS +Up to +.Dx 3.6 +.Nm +created +.Pa /dev/ucom? +rather than the uniform device names created today. +Old scripts must be adjusted accordingly. diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4 index 0865a11eb9..7e71056910 100644 --- a/share/man/man4/uplcom.4 +++ b/share/man/man4/uplcom.4 @@ -14,13 +14,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgment: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -34,9 +27,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.15 2006/08/20 05:56:00 imp Exp $ +.\" $FreeBSD: head/share/man/man4/uplcom.4 238774 2012-07-25 17:25:44Z gavin $ .\" -.Dd July 29, 2007 +.Dd March 14, 2014 .Dt UPLCOM 4 .Os .Sh NAME @@ -47,8 +40,9 @@ To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent -.Cd "device uplcom" +.Cd "device usb" .Cd "device ucom" +.Cd "device uplcom" .Ed .Pp Alternatively, to load the driver as a @@ -70,91 +64,121 @@ driver which makes it behave like a .Sh HARDWARE The .Nm -driver supports the following devices: +driver supports the following devices and adapters: .Pp .Bl -bullet -compact .It -Alcatel One Touch 535/735 phones +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 +Anchor Serial adapter .It -Aten UC-232A USB to serial adapter +ATEN UC-232A .It -BAFO BF-800 and BF-810 USB to serial adapters +BAFO BF-800 and BF-810 .It -Belkin F5U257 USB to serial adapter +Belkin F5U257 .It -Elecom UC-SGT USB to serial adapter +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 -Hama USB RS-232 serial adapter +Hama USB RS-232 Serial Adapter .It Hamlet exagerate XURS232 .It -Huawei UMTS/HSDPA adapters +HP LD220 Point-Of-Sale (POS) Display .It IOGEAR UC-232A .It -I/O DATA USB-RSAQ series USB to serial adapters +I/O DATA USB-RSAQ, USB-RSAQ2, USB-RSAQ3 and USB-RSAQ5 .It -Itegno GSM/GPRS and CDMA modems +iTegno WM1080A GSM/GFPRS Modem +.It +iTegno WM2080A CDMA Modem .It Leadtek 9531 GPS .It -Mobile Action MA-620 IrDA +Micromax 610U Modem +.It +Microsoft Palm 700WX +.It +Mobile Action MA-620 Infrared Adapter .It -Nokia CA-42 USB data cable clones +Motorola Cables .It -Panasonic TYTP50P6S 50" touch panel +Nokia CA-42 Cable .It -Pharos 360 GPS +OTI DKU-5 cable +.It +Panasonic TY-TP50P6-S flat screen +.It +PLX CA-42 Phone Cable .It PLANEX USB-RS232 URS-03 .It -Radio Shack USB to serial cable +Prolific Generic USB-Serial Adapters +.It +Prolific Pharos USB-Serial Adapter +.It +RATOC REX-USB60 .It -RATOC REX-USB60 USB to serial adapter +Radio Shack USB Serial Cable .It -Sagem USB data cables +Sagem USB-Serial Adapter .It -Samsung I330 smartphone cradle +Samsung I330 Phone Cradle .It Sandberg USB to Serial Link (model number 133-08) .It -Siemens SX1 cellphone +Sanwa KB-USB2 Multimeter cable .It -Siemens x65 and x75 series cellphones +Siemens/BenQ EF81, SX1, X65 and X75 Mobile Phones .It -Sitecom USB to serial cable +Sitecom USB-Serial Adapter .It -Sony-Ericsson (Susteen) DCU-10 and DCU-11 USB data cables +SMART Technologies USB-Serial Adapter .It -Sourcenext KeikaiDenwa 8 (with and without charger) +Sony QN3 Phone Cable .It -Susteen Datapilot Universal-2 Phone Cable +Sony Ericsson Datapilot .It -Syntech CPT-8001C barcode scanner USB IR cradle +Sony Ericsson DCU-10 and DCU-11 (Susteen) USB Cables .It -TDK USB-PHS adapter UHA6400 +SOURCENEXT KeikaiDenwa 8 (with and without charger) .It -TDK USB-PDC adapter UPA9664 +Speed Dragon USB-Serial Cable .It -Tripp-Lite U209-000-R USB to serial cable +Syntech CPT-8001C Barcode Scanner .It -Willcom W-SIM DD PHS terminal (WS002IN) -.El -.Pp -The list is far from being complete and the -.Nm -driver provides support for many more devices based on original Prolific -chips or it's clones: -.Pp -.Bl -bullet -compact +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 -Alcor AU9720 USB to serial controller +Willcom W-SIM DD PHS terminal.(WS002IN) .It -Anchor Chips USB to serial controller +YC-Cable USB-Serial Adapter .It -Speed Dragon Multimedia MS3303H USB to serial controller +Zeagle N2iTion3 Diving Computer .El .Sh SEE ALSO .Xr tty 4 , diff --git a/share/man/man4/uslcom.4 b/share/man/man4/uslcom.4 index 4f5db51761..d706cefca6 100644 --- a/share/man/man4/uslcom.4 +++ b/share/man/man4/uslcom.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: uslcom.4,v 1.4 2007/02/17 01:47:47 jsg Exp $ +.\" $OpenBSD: uslcom.4,v 1.6 2007/10/08 03:10:42 jcs Exp $ .\" .\" Copyright (c) 2006 Jonathan Gray .\" @@ -14,19 +14,22 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd August 15, 2007 +.\" $FreeBSD: head/share/man/man4/uslcom.4 239037 2012-08-04 15:11:36Z gavin $ +.\" +.Dd March 14, 2014 .Dt USLCOM 4 .Os .Sh NAME .Nm uslcom -.Nd Silicon Laboratories CP2101, CP2102 and CP2103 USB to serial bridge +.Nd Silicon Laboratories CP2101/CP2102/CP2103/CP2104/CP2105 based USB serial adapter .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent -.Cd "device uslcom" +.Cd "device usb" .Cd "device ucom" +.Cd "device uslcom" .Ed .Pp Alternatively, to load the driver as a @@ -38,43 +41,156 @@ uslcom_load="YES" .Sh DESCRIPTION The .Nm -driver supports devices based on Silicon Laboratories CP2101, CP2102 and -CP2103 USB to serial bridges. -.Pp +driver supports Silicon Laboratories CP2101/CP2102/CP2103/CP2104/CP2105 +based USB serial adapters. +.Sh HARDWARE The following devices should work with the .Nm driver: +.Pp .Bl -bullet -compact .It -Argussoft In-System Programmer +AC-Services CAN, CIS-IBUS, IBUS and OBD interfaces +.It +Aerocomm Radio +.It +AKTACOM ACE-1001 cable +.It +AMBER Wireless AMB2560 +.It +Arkham DS-101 Adapter +.It +Argussoft ISP +.It +Arygon Technologies Mifare RFID Reader +.It +AVIT Research USB-TTL interface +.It +B&G H3000 Data Cable +.It +Balluff RFID reader .It Baltech card reader .It +BEI USB VCP Sensor +.It Burnside Telecom Desktop Mobile .It chip45.com Crumb128 module .It -Enfora EDG1228 EDGE modem +Clipsal 5000CT2, 5500PACA, 5500PCU, 560884, 5800PC, C5000CT2 +and L51xx C-Bus Home Automation products +.It +Commander 2 EDGE(GSM) Modem +.It +Cygnal Fasttrax GPS and Debug adapter +.It +DataApex MultiCOM USB to RS232 converter +.It +Degree Controls USB adapter +.It +DekTec DTA Plus VHF/UHF Booster +.It +Dell DW700 GPS Receiver +.It +Digianswer ZigBee/802.15.4 MAC +.It +Dynastream ANT Development kits +.It +Elan USBcount50, USBscope50, USBpulse100 and USBwave12 +.It +ELV USB-I2C interface +.It +EMS C1007 HF RFID controller +.It +Festo CPX-USB and CMSP interfaces +.It +Gemalto Prox-PU/CU contactless card reader .It Helicomm IP-Link 1220-DVM .It +IMS USB-RS422 adapter +.It +Infinity GPS-MIC-1 Radio Monophone +.It +INSYS Modem +.It +IRZ SG-10 and MC35pu GSM/GPRS Modems +.It Jablotron PC-60B .It -Lipowsky Baby-JTAG +Kamstrup M-Bus Master MultiPort 250D +and Optical Eye/3 wire utility meter interfaces +.It +Kyocera GPS +.It +Link Instruments MS-019 and MS-028 +Oscilloscope/Logic Analyzer/Pattern Generators +.It +Lipowsky Baby-JTAG, Baby-LIN and HARP-1 +.It +MEI CashFlow SC and Series 2000 cash acceptors +.It +MJS USB-TOSLINK Adapter +.It +MobiData GPRS USB Modems +.It +MSD DashHawk +.It +Multiplex RC adapter +.It +Optris MSpro LT Thermometer +.It +Owen AC4 USB-RS485 converter +.It +Pirelli DP-L10 SIP phone +.It +PLX CA-42 Phone cable +.It +Pololu USB to Serial .It -Lipowsky Baby-LIN +Procyon AVS Mind Machine .It -Lipowsky HARP-1 +Renesas RX-Stick for RX610 .It -Pololu USB to serial adapter +Siemens MC60 Cable .It -Suunto USB to serial adapter +Silicon Laboratories generic CP2101/CP2102/CP2103/CP2104/CP2105 chips .It -Tracient RFID readers +Software Bisque Paramount ME .It -West Mountain Radio RIGblaster +SPORTident BSM7-D USB .It -West Mountain Radio RIGtalk +Suunto Sports Instrument +.It +Syntech CipherLab USB Barcode Scanner +.It +T-Com TC 300 SIP phone +.It +Tams Master Easy Control +.It +Telegesis ETRX2USB +.It +Timewave HamLinkUSB +.It +Tracient RFID Reader +.It +Track Systems Traqmate +.It +Vaisala USB Instrument cable +.It +VStabi Controller +.It +WAGO 750-923 USB Service Cable +.It +WaveSense Jazz Blood Glucose Meter +.It +WIENER Plein & Baus CML Data Logger, RCM Remote, +and PL512 and MPOD PSUs +.It +WMR RIGblaster Plug&Play and RIGtalk RT1 +.It +Zephyr Bioharness .El .Sh SEE ALSO .Xr tty 4 , @@ -87,14 +203,13 @@ device driver first appeared in .Ox 4.0 and was imported into .Dx 1.11 . +The first +.Fx +release to include it was +.Fx 7.1 . .Sh AUTHORS .An -nosplit The .Nm driver was written by .An Jonathan Gray Aq Mt jsg@openbsd.org . -.Sh CAVEATS -Setting hardware flow control is not tested. -.Pp -Silicon Laboratories don't release any programming information -on their products. -- 2.41.0