Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Update for the ucom(4) addition.
details: https://anonhg.NetBSD.org/src/rev/e80312bde709
branches: trunk
changeset: 481255:e80312bde709
user: augustss <augustss%NetBSD.org@localhost>
date: Tue Jan 25 08:31:56 2000 +0000
description:
Update for the ucom(4) addition.
diffstat:
share/man/man4/Makefile | 9 +-
share/man/man4/ucom.4 | 80 +++++++++++++++++++++++++++++
share/man/man4/umodem.4 | 19 ++----
sys/arch/alpha/alpha/conf.c | 10 +-
sys/arch/alpha/conf/ALPHA | 3 +-
sys/arch/alpha/conf/ENIWETOK | 3 +-
sys/arch/alpha/conf/GENERIC | 5 +-
sys/arch/arm32/arm32/conf.c | 6 +-
sys/arch/arm32/conf/CATS | 3 +-
sys/arch/arm32/include/conf.h | 4 +-
sys/arch/i386/conf/BIKINI | 3 +-
sys/arch/i386/conf/GENERIC | 5 +-
sys/arch/i386/conf/TRINITY | 3 +-
sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS | 3 +-
sys/arch/i386/i386/conf.c | 9 +-
sys/arch/macppc/conf/GENERIC | 5 +-
sys/arch/macppc/macppc/conf.c | 8 +-
17 files changed, 131 insertions(+), 47 deletions(-)
diffs (truncated from 481 to 300 lines):
diff -r e3a1c222da4a -r e80312bde709 share/man/man4/Makefile
--- a/share/man/man4/Makefile Tue Jan 25 08:12:58 2000 +0000
+++ b/share/man/man4/Makefile Tue Jan 25 08:31:56 2000 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.125 2000/01/24 15:33:12 ad Exp $
+# $NetBSD: Makefile,v 1.126 2000/01/25 08:32:05 augustss Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= ahb.4 ahc.4 aria.4 atalk.4 audio.4 awi.4 bha.4 bpf.4 cardbus.4 ccd.4 \
- cd.4 ch.4 clcs.4 clnp.4 cltp.4 cnw.4 ddb.4 dpt.4 drum.4 eap.4 eisa.4 en.4 \
- ep.4 esh.4 esis.4 eso.4 exphy.4 fd.4 fpa.4 fms.4 fxp.4 \
+ cd.4 ch.4 clcs.4 clnp.4 cltp.4 cnw.4 ddb.4 dpt.4 drum.4 eap.4 eisa.4 \
+ en.4 ep.4 esh.4 esis.4 eso.4 exphy.4 fd.4 fpa.4 fms.4 fxp.4 \
gre.4 icmp.4 icsphy.4 idp.4 ifmedia.4 inet.4 inphy.4 \
iophy.4 ip.4 ipip.4 iso.4 isp.4 lc.4 lkm.4 lo.4 lxtphy.4 \
mbe.4 md.4 mhzc.4 midi.4 mii.4 mpu.4 mtio.4 ncr.4 ne.4 netintro.4 \
@@ -17,7 +17,8 @@
wsmouse.4 wsmux.4 ym.4 zero.4 zstty.4
# USB devices
-MAN+= uaudio.4 ugen.4 uhid.4 ukbd.4 ulpt.4 umass.4 umodem.4 ums.4 usb.4 \
+MAN+= uaudio.4 ucom.4 ugen.4 uhid.4 ukbd.4 ulpt.4 umass.4 \
+ umodem.4 ums.4 usb.4 \
aue.4 cue.4 kue.4 \
uhci.4 ohci.4
diff -r e3a1c222da4a -r e80312bde709 share/man/man4/ucom.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/ucom.4 Tue Jan 25 08:31:56 2000 +0000
@@ -0,0 +1,80 @@
+.\" $NetBSD: ucom.4,v 1.1 2000/01/25 08:32:04 augustss Exp $
+.\"
+.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Lennart Augustsson.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 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 acknowledgement:
+.\" 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
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd November 25, 1999
+.Dt UCOM 4
+.Os
+.Sh NAME
+.Nm ucom
+.Nd USB tty support
+.Sh SYNOPSIS
+.\"Cd "ucom* at uetekcom? portno ?"
+.Cd "ucom* at umodem? portno ?"
+.Pp
+.Sh DESCRIPTION
+The
+.Nm
+driver attaches to USB modems, serial ports, and other devices that need
+to look like a tty.
+The
+.Nm
+driver shows a behaviour like a
+.Xr tty 4 .
+This means that normal programs such as
+.Xr tip 1
+or
+.Xr pppd 8
+can be used to access the device.
+.Pp
+The
+.Va portno
+locator can be used to decide which port to use for device that have
+multiple external ports.
+.Sh FILES
+.Bl -tag -width Pa
+.It Pa /dev/ttyU?
+.El
+.Sh SEE ALSO
+.Xr tty 4 ,
+.\"Xr uetekcom 4 ,
+.Xr umodem 4 ,
+.Xr usb 4
+.Sh HISTORY
+The
+.Nm
+driver
+appeared in
+.Nx 1.5 .
diff -r e3a1c222da4a -r e80312bde709 share/man/man4/umodem.4
--- a/share/man/man4/umodem.4 Tue Jan 25 08:12:58 2000 +0000
+++ b/share/man/man4/umodem.4 Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: umodem.4,v 1.3 1999/08/23 12:32:19 augustss Exp $
+.\" $NetBSD: umodem.4,v 1.4 2000/01/25 08:32:05 augustss Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -42,6 +42,7 @@
.Nd USB modem support
.Sh SYNOPSIS
.Cd "umodem* at uhub?"
+.Cd "ucom* at umodem?"
.Pp
.Sh DESCRIPTION
The
@@ -54,24 +55,16 @@
or handled through separate pipes. In the latter case the AT
commands have to be given on device separate from the data device.
.Pp
-The
-.Nm
-driver shows a behaviour like a
+The device is accessed through the
+.Xr ucom 4
+driver which makes it behave like a
.Xr tty 4 .
-This means that normal programs such as
-.Xr tip 1
-or
-.Xr pppd 8
-can be used to access the modem.
-.Sh FILES
-.Bl -tag -width Pa
-.It Pa /dev/ttyU?
-.El
.Sh BUGS
Only modems with multiplexed commands and data are supported
at the moment.
.Sh SEE ALSO
.Xr tty 4 ,
+.Xr ucom 4 ,
.Xr usb 4
.Sh HISTORY
The
diff -r e3a1c222da4a -r e80312bde709 sys/arch/alpha/alpha/conf.c
--- a/sys/arch/alpha/alpha/conf.c Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/alpha/alpha/conf.c Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.42 2000/01/20 17:15:20 mjacob Exp $ */
+/* $NetBSD: conf.c,v 1.43 2000/01/25 08:31:56 augustss Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.42 2000/01/20 17:15:20 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.43 2000/01/25 08:31:56 augustss Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,8 +192,8 @@
cdev_decl(ugen);
#include "ulpt.h"
cdev_decl(ulpt);
-#include "umodem.h"
-cdev_decl(umodem);
+#include "ucom.h"
+cdev_decl(ucom);
#ifdef __I4B_IS_INTEGRATED
/* open, close, ioctl */
@@ -320,7 +320,7 @@
cdev_notdef(), /* 55 */
#endif
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
- cdev_tty_init(NUMODEM, umodem), /* 57: USB modem */
+ cdev_tty_init(NUCOM, ucom), /* 57: USB tty */
cdev_ses_init(NSES,ses), /* 58: SCSI SES/SAF-TE */
};
diff -r e3a1c222da4a -r e80312bde709 sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/alpha/conf/ALPHA Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.112 2000/01/20 17:14:42 mjacob Exp $
+# $NetBSD: ALPHA,v 1.113 2000/01/25 08:31:57 augustss Exp $
#
# Alpha kernel with all the options you'd want, and more.
@@ -387,6 +387,7 @@
# USB Modem
umodem* at uhub? port ? configuration ?
+ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
diff -r e3a1c222da4a -r e80312bde709 sys/arch/alpha/conf/ENIWETOK
--- a/sys/arch/alpha/conf/ENIWETOK Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/alpha/conf/ENIWETOK Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ENIWETOK,v 1.15 2000/01/19 03:05:06 mycroft Exp $
+# $NetBSD: ENIWETOK,v 1.16 2000/01/25 08:31:57 augustss Exp $
# From: GENERIC,v 1.139 2000/01/19 03:01:46 mycroft Exp
#
# Mycroft's AS200.
@@ -377,6 +377,7 @@
# USB Modem
#umodem* at uhub? port ? configuration ?
+#ucom* at umodem?
# USB Mass Storage
#umass* at uhub? port ? configuration ? interface ?
diff -r e3a1c222da4a -r e80312bde709 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/alpha/conf/GENERIC Tue Jan 25 08:31:56 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.141 2000/01/23 23:46:04 hubertf Exp $
+# $NetBSD: GENERIC,v 1.142 2000/01/25 08:31:58 augustss Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
include "arch/alpha/conf/std.alpha"
-#ident "GENERIC-$Revision: 1.141 $"
+#ident "GENERIC-$Revision: 1.142 $"
maxusers 32
@@ -353,6 +353,7 @@
# USB Modem
umodem* at uhub? port ? configuration ?
+ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
diff -r e3a1c222da4a -r e80312bde709 sys/arch/arm32/arm32/conf.c
--- a/sys/arch/arm32/arm32/conf.c Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/arm32/arm32/conf.c Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.40 1999/08/16 22:27:13 augustss Exp $ */
+/* $NetBSD: conf.c,v 1.41 2000/01/25 08:31:59 augustss Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -183,7 +183,7 @@
#include "ugen.h"
#include "ugen.h"
#include "ulpt.h"
-#include "umodem.h"
+#include "ucom.h"
#include "vcoda.h" /* coda file system */
#include "wsdisplay.h"
#include "wskbd.h"
@@ -285,7 +285,7 @@
cdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
cdev_ugen_init(NUGEN,ugen), /* 72: USB generic driver */
cdev_mouse_init(NWSMUX,wsmux), /* 73: ws multiplexor */
- cdev_tty_init(NUMODEM,umodem), /* 74: USB modem */
+ cdev_tty_init(NUCOM,ucom), /* 74: USB tty */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff -r e3a1c222da4a -r e80312bde709 sys/arch/arm32/conf/CATS
--- a/sys/arch/arm32/conf/CATS Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/arm32/conf/CATS Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CATS,v 1.22 2000/01/17 17:47:04 augustss Exp $
+# $NetBSD: CATS,v 1.23 2000/01/25 08:31:59 augustss Exp $
#
# CATS -- CHALTECH CATS Development kernel
#
@@ -307,6 +307,7 @@
# USB Modem
umodem* at uhub? port ? configuration ?
+ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
diff -r e3a1c222da4a -r e80312bde709 sys/arch/arm32/include/conf.h
--- a/sys/arch/arm32/include/conf.h Tue Jan 25 08:12:58 2000 +0000
+++ b/sys/arch/arm32/include/conf.h Tue Jan 25 08:31:56 2000 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index