Module Name: src
Committed By: mrg
Date: Tue May 7 22:00:10 UTC 2019
Modified Files:
src/share/man/man4: umcs.4
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
src/sys/dev/usb: TODO.usbmp files.usb
Removed Files:
src/sys/dev/usb: moscom.c
Log Message:
obsolete moscom(4). it was never in any default configs, did
not work for some cases.
umcs(4) supports everything it does plus one additional chipset,
has been in default configurations since netbsd 7.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/umcs.4
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.467 -r1.468 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.154 -r1.155 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.12 -r0 src/sys/dev/usb/moscom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/umcs.4
diff -u src/share/man/man4/umcs.4:1.2 src/share/man/man4/umcs.4:1.3
--- src/share/man/man4/umcs.4:1.2 Sun Mar 16 09:37:47 2014
+++ src/share/man/man4/umcs.4 Tue May 7 22:00:10 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: umcs.4,v 1.2 2014/03/16 09:37:47 wiz Exp $
+.\" $NetBSD: umcs.4,v 1.3 2019/05/07 22:00:10 mrg Exp $
.\"
.\" Copyright (c) 2014 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 16, 2014
+.Dd May 7, 2019
.Dt UMCS 4
.Os
.Sh NAME
@@ -69,7 +69,3 @@ The
driver
appeared in
.Nx 7 .
-.Pp
-It superseded the
-.Xr moscom 4
-driver.
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.118 src/sys/arch/amd64/conf/ALL:1.119
--- src/sys/arch/amd64/conf/ALL:1.118 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/amd64/conf/ALL Tue May 7 22:00:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.118 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: ALL,v 1.119 2019/05/07 22:00:10 mrg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.118 $"
+#ident "ALL-$Revision: 1.119 $"
maxusers 64 # estimated number of users
@@ -1289,8 +1289,8 @@ ucom* at uvscom? portno ?
uark* at uhub? port ?
ucom* at uark? portno ?
-moscom* at uhub? port ?
-ucom* at moscom? portno ?
+umcs* at uhub? port ? # Moschip MCS7xxx serial adapter
+ucom* at umcs? portno ?
uhmodem* at uhub?
ucom* at uhmodem? portno ?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.467 src/sys/arch/i386/conf/ALL:1.468
--- src/sys/arch/i386/conf/ALL:1.467 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/i386/conf/ALL Tue May 7 22:00:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.467 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: ALL,v 1.468 2019/05/07 22:00:10 mrg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.467 $"
+#ident "ALL-$Revision: 1.468 $"
maxusers 64 # estimated number of users
@@ -1392,9 +1392,6 @@ ucom* at uvscom? portno ?
uark* at uhub? port ?
ucom* at uark? portno ?
-moscom* at uhub? port ?
-ucom* at moscom? portno ?
-
umcs* at uhub? port ? # Moschip MCS7xxx serial adapter
ucom* at umcs? portno ?
Index: src/sys/dev/usb/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.11 src/sys/dev/usb/TODO.usbmp:1.12
--- src/sys/dev/usb/TODO.usbmp:1.11 Mon Nov 21 08:48:00 2016
+++ src/sys/dev/usb/TODO.usbmp Tue May 7 22:00:10 2019
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.11 2016/11/21 08:48:00 skrll Exp $
+$NetBSD: TODO.usbmp,v 1.12 2019/05/07 22:00:10 mrg Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -201,7 +201,7 @@ ucom attachments:
- uplcom attaches ok
- uslsa working
- uvscom
- - moscom
+ - umcs
- uvisor
- ukyopon
- u3g
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.154 src/sys/dev/usb/files.usb:1.155
--- src/sys/dev/usb/files.usb:1.154 Wed Feb 6 11:55:06 2019
+++ src/sys/dev/usb/files.usb Tue May 7 22:00:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.154 2019/02/06 11:55:06 rin Exp $
+# $NetBSD: files.usb,v 1.155 2019/05/07 22:00:10 mrg Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -418,11 +418,6 @@ attach umct at usbdevif
file dev/usb/umct.c umct
# MOSCHIP MCS7xxx serial driver
-device moscom: ucombus
-attach moscom at usbdevif
-file dev/usb/moscom.c moscom
-
-# andother driver for the same chip
device umcs: ucombus
attach umcs at usbdevif
file dev/usb/umcs.c umcs
