Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove opms(4) and its device, /dev/pms0, from the i386 port...
details: https://anonhg.NetBSD.org/src/rev/385c47b11ddf
branches: trunk
changeset: 525824:385c47b11ddf
user: wiz <wiz%NetBSD.org@localhost>
date: Thu Apr 18 12:54:09 2002 +0000
description:
Remove opms(4) and its device, /dev/pms0, from the i386 port, because
it has been obsoleted by pms(4).
Reviewed by fvdl and christos.
diffstat:
distrib/sets/lists/man/mi | 4 +-
distrib/sets/lists/man/obsolete.mi | 4 +-
etc/etc.i386/MAKEDEV | 8 +-
share/man/man4/man4.i386/Makefile | 4 +-
share/man/man4/man4.i386/opms.4 | 73 ---
sys/arch/i386/conf/CARDBUS | 7 +-
sys/arch/i386/conf/DELPHI | 8 +-
sys/arch/i386/conf/DISKLESS | 3 +-
sys/arch/i386/conf/DR-EVIL | 5 +-
sys/arch/i386/conf/GENERIC | 7 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 7 +-
sys/arch/i386/conf/GENERIC_TINY | 5 +-
sys/arch/i386/conf/HOMEWORLD | 5 +-
sys/arch/i386/conf/INSTALL | 5 +-
sys/arch/i386/conf/INSTALL_LAPTOP | 4 +-
sys/arch/i386/conf/INSTALL_SMALL | 3 +-
sys/arch/i386/conf/INSTALL_TINY | 3 +-
sys/arch/i386/conf/IOPENER | 6 +-
sys/arch/i386/conf/LAMB | 6 +-
sys/arch/i386/conf/MINBAR | 5 +-
sys/arch/i386/conf/NBFTP | 5 +-
sys/arch/i386/conf/SWINGER | 7 +-
sys/arch/i386/conf/files.i386 | 6 +-
sys/arch/i386/i386/conf.c | 8 +-
sys/arch/i386/include/conf.h | 4 +-
sys/arch/i386/isa/pms.c | 691 -------------------------------------
26 files changed, 38 insertions(+), 855 deletions(-)
diffs (truncated from 1420 to 300 lines):
diff -r 5e307f419b24 -r 385c47b11ddf distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Thu Apr 18 12:33:26 2002 +0000
+++ b/distrib/sets/lists/man/mi Thu Apr 18 12:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.465 2002/04/07 15:45:02 wiz Exp $
+# $NetBSD: mi,v 1.466 2002/04/18 12:54:09 wiz Exp $
./usr/share/info/am-utils.info man-amd-info
./usr/share/info/as.info man-computil-info
./usr/share/info/awk.info man-util-info
@@ -676,7 +676,6 @@
./usr/share/man/cat4/i386/npx.0 man-sys-catman
./usr/share/man/cat4/i386/olms.0 man-sys-catman
./usr/share/man/cat4/i386/omms.0 man-sys-catman
-./usr/share/man/cat4/i386/opms.0 man-sys-catman
./usr/share/man/cat4/i386/pcibios.0 man-sys-catman
./usr/share/man/cat4/i386/pnpbios.0 man-sys-catman
./usr/share/man/cat4/icmp.0 man-sys-catman
@@ -2367,7 +2366,6 @@
./usr/share/man/man4/i386/npx.4 man-sys-man
./usr/share/man/man4/i386/olms.4 man-sys-man
./usr/share/man/man4/i386/omms.4 man-sys-man
-./usr/share/man/man4/i386/opms.4 man-sys-man
./usr/share/man/man4/i386/pcibios.4 man-sys-man
./usr/share/man/man4/i386/pnpbios.4 man-sys-man
./usr/share/man/man4/icmp.4 man-sys-man
diff -r 5e307f419b24 -r 385c47b11ddf distrib/sets/lists/man/obsolete.mi
--- a/distrib/sets/lists/man/obsolete.mi Thu Apr 18 12:33:26 2002 +0000
+++ b/distrib/sets/lists/man/obsolete.mi Thu Apr 18 12:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.44 2002/04/07 15:45:02 wiz Exp $
+# $NetBSD: obsolete.mi,v 1.45 2002/04/18 12:54:10 wiz Exp $
/usr/share/man/cat1/amq.0
/usr/share/man/cat1/g711conv.0
/usr/share/man/cat1/i386
@@ -50,6 +50,7 @@
/usr/share/man/cat4/i386/ie.0
/usr/share/man/cat4/i386/joy.0
/usr/share/man/cat4/i386/le.0
+/usr/share/man/cat4/i386/opms.0
/usr/share/man/cat4/i386/pcvt.0
/usr/share/man/cat4/i386/pms.0
/usr/share/man/cat4/i386/speaker.0
@@ -174,6 +175,7 @@
/usr/share/man/man4/i386/ie.4
/usr/share/man/man4/i386/joy.4
/usr/share/man/man4/i386/le.4
+/usr/share/man/man4/i386/opms.4
/usr/share/man/man4/i386/pcvt.4
/usr/share/man/man4/i386/pms.4
/usr/share/man/man4/i386/speaker.4
diff -r 5e307f419b24 -r 385c47b11ddf etc/etc.i386/MAKEDEV
--- a/etc/etc.i386/MAKEDEV Thu Apr 18 12:33:26 2002 +0000
+++ b/etc/etc.i386/MAKEDEV Thu Apr 18 12:54:09 2002 +0000
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: MAKEDEV,v 1.174 2002/03/16 17:03:33 martin Exp $
+# $NetBSD: MAKEDEV,v 1.175 2002/04/18 12:54:11 wiz Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -64,7 +64,6 @@
# Pointing devices:
# mms* Microsoft bus mouse
# lms* Logitech bus mouse
-# pms* PS/2 mouse
# wsmouse* wscons mouse events
#
# Keyboard devices:
@@ -174,7 +173,7 @@
makedev bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
makedev lpt0 lpt1 lpt2 ttyv0 tun0 tun1 tun2 tun3 ipl
makedev ccd0 ccd1 ccd2 ccd3 md0 ss0 ch0 uk0 uk1 random
- makedev speaker lkm mms0 lms0 pms0 joy0 joy1 apm local satlink0
+ makedev speaker lkm mms0 lms0 joy0 joy1 apm local satlink0
makedev iop0 mlx0 mly0
makedev audio
makedev radio
@@ -664,13 +663,12 @@
mknod $name$unit c $chr $(($unit + $flags))
;;
-bpf*|tun*|mms*|lms*|pms*|joy*)
+bpf*|tun*|mms*|lms*|joy*)
case $i in
bpf*) name=bpf; unit=${i#bpf}; chr=23;;
tun*) name=tun; unit=${i#tun}; chr=40;;
mms*) name=mms; unit=${i#mms}; chr=35;;
lms*) name=lms; unit=${i#lms}; chr=36;;
- pms*) name=pms; unit=${i#pms}; chr=37;;
joy*) name=joy; unit=${i#joy}; chr=26;;
esac
rm -f $name$unit
diff -r 5e307f419b24 -r 385c47b11ddf share/man/man4/man4.i386/Makefile
--- a/share/man/man4/man4.i386/Makefile Thu Apr 18 12:33:26 2002 +0000
+++ b/share/man/man4/man4.i386/Makefile Thu Apr 18 12:54:09 2002 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2002/02/06 21:06:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.51 2002/04/18 12:54:11 wiz Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= apm.4 autoconf.4 busmouse.4 console.4 fdc.4 \
intro.4 io.4 lms.4 lpt.4 mem.4 mms.4 npx.4 \
- opms.4 pcibios.4 pnpbios.4
+ pcibios.4 pnpbios.4
MLINKS= mem.4 kmem.4 lms.4 olms.4 mms.4 omms.4
MLINKS+=pcibios.4 PCIBIOS.4
MANSUBDIR=/i386
diff -r 5e307f419b24 -r 385c47b11ddf share/man/man4/man4.i386/opms.4
--- a/share/man/man4/man4.i386/opms.4 Thu Apr 18 12:33:26 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-.\" $NetBSD: opms.4,v 1.7 2002/01/15 01:43:27 wiz Exp $
-.\"
-.\" Copyright (c) 1993 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" 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 for the
-.\" NetBSD Project. See http://www.netbsd.org/ for
-.\" information about NetBSD.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-.\"
-.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-.\"
-.Dd March 12, 1997
-.Dt OPMS 4 i386
-.Os
-.Sh NAME
-.Nm opms
-.Nd PS/2 auxiliary port mouse driver
-.Sh SYNOPSIS
-.Cd pckbc* at isa?
-.Cd opms* at pckbc?
-.Cd opms0 at pc? irq 12
-.Cd opms0 at vt? irq 12
-.Sh DESCRIPTION
-This driver provides a interface to a PS/2 auxiliary port mouse which
-is backwards-compatible to previous
-.Nx / i386
-versions without
-.Xr wscons 4
-support.
-The
-.Dq opms
-driver internally converts the PS/2 mouse output into
-.Xr busmouse 4
-protocol.
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/pms0
-first PS/2 mouse device.
-.El
-.Sh SEE ALSO
-.Xr busmouse 4 ,
-.Xr lms 4 ,
-.Xr mms 4 ,
-.Xr pckbc 4 ,
-.Xr pms 4 ,
-.Xr wsmouse 4
-.Sh BUGS
-The
-.Nm
-device probe routine has been known to confuse some keyboard controllers.
diff -r 5e307f419b24 -r 385c47b11ddf sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Thu Apr 18 12:33:26 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Thu Apr 18 12:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.56 2002/04/17 02:22:48 mycroft Exp $
+# $NetBSD: CARDBUS,v 1.57 2002/04/18 12:54:12 wiz Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.56 $"
+#ident "CARDBUS-$Revision: 1.57 $"
maxusers 32 # estimated number of users
@@ -329,9 +329,7 @@
# wscons
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
-# "opms" should not be enabled together with "pms"
pms* at pckbc? # PS/2 mouse for wsmouse
-#opms* at pckbc? # backwards compatible PS/2 mouse
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -896,7 +894,6 @@
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
-#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
# Joysticks
diff -r 5e307f419b24 -r 385c47b11ddf sys/arch/i386/conf/DELPHI
--- a/sys/arch/i386/conf/DELPHI Thu Apr 18 12:33:26 2002 +0000
+++ b/sys/arch/i386/conf/DELPHI Thu Apr 18 12:54:09 2002 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: DELPHI,v 1.15 2002/04/17 02:22:48 mycroft Exp $
+# $NetBSD: DELPHI,v 1.16 2002/04/18 12:54:12 wiz Exp $
#
# DELPHI -- one of thorpej%zembu.com@localhost's devel machines
#
include "arch/i386/conf/std.i386"
-ident "DELPHI-$Revision: 1.15 $"
+ident "DELPHI-$Revision: 1.16 $"
maxusers 64 # estimated number of users
@@ -275,9 +275,7 @@
# wscons
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
-# "opms" should not be enabled together with "pms"
pms* at pckbc? # PS/2 mouse for wsmouse
-#opms* at pckbc? # backwards compatible PS/2 mouse
#vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -729,8 +727,6 @@
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
-#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
-#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks
diff -r 5e307f419b24 -r 385c47b11ddf sys/arch/i386/conf/DISKLESS
--- a/sys/arch/i386/conf/DISKLESS Thu Apr 18 12:33:26 2002 +0000
+++ b/sys/arch/i386/conf/DISKLESS Thu Apr 18 12:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.83 2002/04/17 02:22:48 mycroft Exp $
+# $NetBSD: DISKLESS,v 1.84 2002/04/18 12:54:12 wiz Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -152,7 +152,6 @@
olms1 at isa? port 0x238 irq 5
omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
omms1 at isa? port 0x238 irq 5
-#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers
diff -r 5e307f419b24 -r 385c47b11ddf sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL Thu Apr 18 12:33:26 2002 +0000
+++ b/sys/arch/i386/conf/DR-EVIL Thu Apr 18 12:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DR-EVIL,v 1.42 2002/04/17 02:22:49 mycroft Exp $
+# $NetBSD: DR-EVIL,v 1.43 2002/04/18 12:54:13 wiz Exp $
#
# DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej%netbsd.org@localhost
#
@@ -309,9 +309,7 @@
# wscons
pckbc* at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
-# "opms" should not be enabled together with "pms"
pms* at pckbc? # PS/2 mouse for wsmouse
-#opms* at pckbc? # backwards compatible PS/2 mouse
#vga0 at isa?
vga* at pci?
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -784,7 +782,6 @@
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
-#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
Home |
Main Index |
Thread Index |
Old Index