Remove last traces of obsolete olms and omms drivers.

Ok'd by drochner and fvdl.
This commit is contained in:
wiz 2003-05-15 13:13:21 +00:00
parent d9380c052a
commit ee6d7b94d4
20 changed files with 33 additions and 1054 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.581 2003/05/15 06:14:14 wiz Exp $
# $NetBSD: mi,v 1.582 2003/05/15 13:13:21 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
@ -715,8 +715,6 @@
./usr/share/man/cat4/i386/mem.0 man-sys-catman
./usr/share/man/cat4/i386/mms.0 man-sys-catman
./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/pcibios.0 man-sys-catman
./usr/share/man/cat4/i386/pnpbios.0 man-sys-catman
./usr/share/man/cat4/icmp.0 man-sys-catman
@ -2525,8 +2523,6 @@
./usr/share/man/man4/i386/mem.4 man-sys-man
./usr/share/man/man4/i386/mms.4 man-sys-man
./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/pcibios.4 man-sys-man
./usr/share/man/man4/i386/pnpbios.4 man-sys-man
./usr/share/man/man4/icmp.4 man-sys-man

View File

@ -1,4 +1,4 @@
# $NetBSD: obsolete.mi,v 1.66 2003/05/15 06:14:15 wiz Exp $
# $NetBSD: obsolete.mi,v 1.67 2003/05/15 13:13:22 wiz Exp $
./usr/share/info/g++FAQ.info
./usr/share/info/tar.info
./usr/share/man/cat1/amq.0
@ -74,6 +74,8 @@
./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/olms.0
./usr/share/man/cat4/i386/omms.0
./usr/share/man/cat4/i386/opms.0
./usr/share/man/cat4/i386/pcvt.0
./usr/share/man/cat4/i386/pms.0
@ -240,6 +242,8 @@
./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/olms.4
./usr/share/man/man4/i386/omms.4
./usr/share/man/man4/i386/opms.4
./usr/share/man/man4/i386/pcvt.4
./usr/share/man/man4/i386/pms.4

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.53 2003/04/28 09:53:43 augustss Exp $
# $NetBSD: Makefile,v 1.54 2003/05/15 13:13:22 wiz Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= apm.4 autoconf.4 busmouse.4 console.4 elansc.4 fdc.4 \
intro.4 io.4 lms.4 lpt.4 mem.4 mms.4 npx.4 \
pcibios.4 pnpbios.4
MLINKS= mem.4 kmem.4 lms.4 olms.4 mms.4 omms.4
MLINKS= mem.4 kmem.4
MLINKS+=pcibios.4 PCIBIOS.4
MLINKS+=console.4 cons.4
MANSUBDIR=/i386

View File

@ -1,4 +1,4 @@
.\" $NetBSD: lms.4,v 1.15 2002/01/15 01:42:14 wiz Exp $
.\" $NetBSD: lms.4,v 1.16 2003/05/15 13:13:23 wiz Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
@ -32,7 +32,7 @@
.\"
.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
.\"
.Dd March 12, 1997
.Dd May 15, 2003
.Dt LMS 4 i386
.Os
.Sh NAME
@ -42,26 +42,12 @@
.Cd lms0 at isa? port 0x23c irq 5
.Cd lms1 at isa? port 0x238 irq 5
.Cd wsmouse* at lms?
.Cd olms0 at isa? port 0x23c irq 5
.Cd olms1 at isa? port 0x238 irq 5
.Sh DESCRIPTION
This driver provides an interface to a Logitech-style bus mouse.
Mouse related data are accessed by
.Xr wsmouse 4
devices.
The
.Dq olms
versions are provided for compatibility.
They use the
.Xr busmouse 4
protocol.
.Sh FILES
.Bl -tag -width Pa -compact
.It Pa /dev/lms0
first Logitech-style bus mouse
.El
.Sh SEE ALSO
.Xr busmouse 4 ,
.Xr mms 4 ,
.Xr pms 4 ,
.Xr wsmouse 4

View File

@ -1,4 +1,4 @@
.\" $NetBSD: mms.4,v 1.15 2002/01/15 01:42:40 wiz Exp $
.\" $NetBSD: mms.4,v 1.16 2003/05/15 13:13:23 wiz Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
@ -42,26 +42,12 @@
.Cd mms0 at isa? port 0x23c irq 5
.Cd mms1 at isa? port 0x238 irq 5
.Cd wsmouse* at mms?
.Cd omms0 at isa? port 0x23c irq 5
.Cd omms1 at isa? port 0x238 irq 5
.Sh DESCRIPTION
This driver provides an interface to a Microsoft-style bus mouse.
Mouse related data are accessed by
.Xr wsmouse 4
devices.
The
.Dq omms
versions are provided for compatibility.
They use the
.Xr busmouse 4
protocol.
.Sh FILES
.Bl -tag -width Pa -compact
.It Pa /dev/mms0
first Microsoft-style bus mouse
.El
.Sh SEE ALSO
.Xr busmouse 4 ,
.Xr lms 4 ,
.Xr pms 4 ,
.Xr wsmouse 4

View File

@ -1,4 +1,4 @@
# $NetBSD: DELPHI,v 1.27 2003/04/10 22:06:57 christos Exp $
# $NetBSD: DELPHI,v 1.28 2003/05/15 13:13:23 wiz Exp $
#
# DELPHI -- one of thorpej@zembu.com's devel machines
#
@ -7,7 +7,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
ident "DELPHI-$Revision: 1.27 $"
ident "DELPHI-$Revision: 1.28 $"
maxusers 64 # estimated number of users
@ -692,11 +692,6 @@ spkr0 at pcppi? # PC speaker
#mms1 at isa? port 0x238 irq 5
#wsmouse* at lms? mux 0
#wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: DISKLESS,v 1.93 2003/04/10 22:06:57 christos Exp $
# $NetBSD: DISKLESS,v 1.94 2003/05/15 13:13:23 wiz Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@ -152,11 +152,6 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
lpt1 at isa? port 0x278
lpt2 at isa? port 0x3bc
olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
olms1 at isa? port 0x238 irq 5
omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
omms1 at isa? port 0x238 irq 5
#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers
#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers

View File

@ -1,4 +1,4 @@
# $NetBSD: DR-EVIL,v 1.56 2003/04/10 22:06:57 christos Exp $
# $NetBSD: DR-EVIL,v 1.57 2003/05/15 13:13:23 wiz Exp $
#
# DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej@netbsd.org
#
@ -744,11 +744,6 @@ bktr* at pci? dev ? function ?
#mms1 at isa? port 0x238 irq 5
#wsmouse* at lms? mux 0
#wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.559 2003/05/04 16:16:18 ad Exp $
# $NetBSD: GENERIC,v 1.560 2003/05/15 13:13:23 wiz Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.559 $"
#ident "GENERIC-$Revision: 1.560 $"
maxusers 32 # estimated number of users
@ -1043,11 +1043,6 @@ mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
mms1 at isa? port 0x238 irq 5
wsmouse* at lms? mux 0
wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_LAPTOP,v 1.73 2003/04/12 07:39:39 simonb Exp $
# $NetBSD: GENERIC_LAPTOP,v 1.74 2003/05/15 13:13:24 wiz Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.73 $"
#ident "GENERIC-$Revision: 1.74 $"
maxusers 32 # estimated number of users
@ -722,11 +722,6 @@ mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
mms1 at isa? port 0x238 irq 5
wsmouse* at lms? mux 0
wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_TINY,v 1.55 2003/04/10 22:06:58 christos Exp $
# $NetBSD: GENERIC_TINY,v 1.56 2003/05/15 13:13:24 wiz Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@ -503,15 +503,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
#spkr0 at pcppi? # PC speaker
# Mice
# ISA busmice
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks
# ISA Plug-and-Play joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.218 2003/05/04 16:16:19 ad Exp $
# $NetBSD: INSTALL,v 1.219 2003/05/15 13:13:24 wiz Exp $
#
# INSTALL - Installation kernel.
#
@ -672,11 +672,6 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
#mms1 at isa? port 0x238 irq 5
#wsmouse* at lms?
#wsmouse* at mms?
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL_SMALL,v 1.96 2003/04/10 22:06:58 christos Exp $
# $NetBSD: INSTALL_SMALL,v 1.97 2003/05/15 13:13:25 wiz Exp $
#
# INSTALL_SMALL - Small Installation kernel.
#
@ -451,15 +451,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
#spkr0 at pcppi? # PC speaker
# Mice
# ISA busmice
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks
# ISA Plug-and-Play joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL_TINY,v 1.69 2003/04/23 14:21:07 jmmv Exp $
# $NetBSD: INSTALL_TINY,v 1.70 2003/05/15 13:13:25 wiz Exp $
#
# INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
#
@ -458,15 +458,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
#spkr0 at pcppi? # PC speaker
# Mice
# ISA busmice
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks
# ISA Plug-and-Play joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: SWINGER,v 1.42 2003/04/10 22:06:59 christos Exp $
# $NetBSD: SWINGER,v 1.43 2003/05/15 13:13:25 wiz Exp $
# from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
#
# SWINGER -- thorpej's Abit BP6+dual Celeron
@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "SWINGER-$Revision: 1.42 $"
#ident "SWINGER-$Revision: 1.43 $"
maxusers 64 # estimated number of users
@ -717,11 +717,6 @@ bktr* at pci? dev ? function ?
#mms1 at isa? port 0x238 irq 5
#wsmouse* at lms? mux 0
#wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
# Joysticks

View File

@ -1,4 +1,4 @@
# $NetBSD: files.i386,v 1.238 2003/05/14 12:04:56 drochner Exp $
# $NetBSD: files.i386,v 1.239 2003/05/15 13:13:25 wiz Exp $
#
# new style config file for i386 architecture
#
@ -233,16 +233,10 @@ device pcconskbd
attach pcconskbd at pckbc
file arch/i386/isa/pccons.c pc | pcconskbd needs-flag
# PC Mice; Logitech-style, Microsoft-style, and PS/2-style
device olms
attach olms at isa
file arch/i386/isa/olms.c olms needs-flag
# PC Mice: Logitech-style and Microsoft-style
device lms: wsmousedev
attach lms at isa
file arch/i386/isa/lms.c lms
device omms
attach omms at isa
file arch/i386/isa/omms.c omms needs-flag
device mms: wsmousedev
attach mms at isa
file arch/i386/isa/mms.c mms

View File

@ -1,4 +1,4 @@
# $NetBSD: majors.i386,v 1.12 2003/05/13 15:43:42 thorpej Exp $
# $NetBSD: majors.i386,v 1.13 2003/05/15 13:13:25 wiz Exp $
#
# Device majors for i386
#
@ -33,9 +33,10 @@ device-major joy char 26 joy
device-major spkr char 27 spkr
device-major lkm char 28 lkm
device-major omms char 35 omms
device-major olms char 36 olms
device-major opms char 37 opms
# next three are obsolete
#device-major omms char 35 omms
#device-major olms char 36 olms
#device-major opms char 37 opms
device-major cy char 38 cy
device-major mcd char 39 block 7 mcd
device-major tun char 40 tun

View File

@ -1,464 +0,0 @@
/* $NetBSD: olms.c,v 1.10 2002/11/26 19:50:25 christos Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
* Copyright (c) 1992, 1993 Erik Forsberg.
* 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.
*
* THIS SOFTWARE IS PROVIDED BY ``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 I 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.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: olms.c,v 1.10 2002/11/26 19:50:25 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/select.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/device.h>
#include <sys/poll.h>
#include <sys/conf.h>
#include <machine/cpu.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/mouse.h>
#include <dev/isa/isavar.h>
#define LMS_DATA 0 /* offset for data port, read-only */
#define LMS_SIGN 1 /* offset for signature port, read-write */
#define LMS_INTR 2 /* offset for interrupt port, read-only */
#define LMS_CNTRL 2 /* offset for control port, write-only */
#define LMS_CONFIG 3 /* for configuration port, read-write */
#define LMS_NPORTS 4
#define LMS_CHUNK 128 /* chunk size for read */
#define LMS_BSIZE 1020 /* buffer size */
struct olms_softc { /* driver status information */
struct device sc_dev;
void *sc_ih;
bus_space_tag_t sc_iot; /* bus i/o space identifier */
bus_space_handle_t sc_ioh; /* bus i/o handle */
struct clist sc_q;
struct selinfo sc_rsel;
u_char sc_state; /* mouse driver state */
#define LMS_OPEN 0x01 /* device is open */
#define LMS_ASLP 0x02 /* waiting for mouse data */
u_char sc_status; /* mouse button status */
int sc_x, sc_y; /* accumulated motion in the X,Y axis */
};
int olmsprobe __P((struct device *, struct cfdata *, void *));
void olmsattach __P((struct device *, struct device *, void *));
int olmsintr __P((void *));
CFATTACH_DECL(olms, sizeof(struct olms_softc),
olmsprobe, olmsattach, NULL, NULL);
extern struct cfdriver olms_cd;
dev_type_open(lmsopen);
dev_type_close(lmsclose);
dev_type_read(lmsread);
dev_type_ioctl(lmsioctl);
dev_type_poll(lmspoll);
dev_type_kqfilter(lmskqfilter);
const struct cdevsw olms_cdevsw = {
lmsopen, lmsclose, lmsread, nowrite, lmsioctl,
nostop, notty, lmspoll, nommap, lmskqfilter,
};
#define LMSUNIT(dev) (minor(dev))
int
olmsprobe(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh;
int rv;
if (ia->ia_nio < 1)
return (0);
if (ia->ia_nirq < 1)
return (0);
if (ISA_DIRECT_CONFIG(ia))
return (0);
/* Disallow wildcarded i/o base. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
return 0;
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
return 0;
/* Map the i/o space. */
if (bus_space_map(iot, ia->ia_io[0].ir_addr, LMS_NPORTS, 0, &ioh))
return 0;
rv = 0;
/* Configure and check for port present. */
bus_space_write_1(iot, ioh, LMS_CONFIG, 0x91);
delay(10);
bus_space_write_1(iot, ioh, LMS_SIGN, 0x0c);
delay(10);
if (bus_space_read_1(iot, ioh, LMS_SIGN) != 0x0c)
goto out;
bus_space_write_1(iot, ioh, LMS_SIGN, 0x50);
delay(10);
if (bus_space_read_1(iot, ioh, LMS_SIGN) != 0x50)
goto out;
/* Disable interrupts. */
bus_space_write_1(iot, ioh, LMS_CNTRL, 0x10);
rv = 1;
ia->ia_nio = 1;
ia->ia_io[0].ir_size = LMS_NPORTS;
ia->ia_nirq = 1;
ia->ia_niomem = 0;
ia->ia_ndrq = 0;
out:
bus_space_unmap(iot, ioh, LMS_NPORTS);
return rv;
}
void
olmsattach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct olms_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh;
printf("\n");
if (bus_space_map(iot, ia->ia_io[0].ir_addr, LMS_NPORTS, 0, &ioh)) {
printf("%s: can't map i/o space\n", sc->sc_dev.dv_xname);
return;
}
/* Other initialization was done by olmsprobe. */
sc->sc_iot = iot;
sc->sc_ioh = ioh;
sc->sc_state = 0;
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
IST_PULSE, IPL_TTY, olmsintr, sc);
}
int
lmsopen(dev, flag, mode, p)
dev_t dev;
int flag;
int mode;
struct proc *p;
{
int unit = LMSUNIT(dev);
struct olms_softc *sc;
if (unit >= olms_cd.cd_ndevs)
return ENXIO;
sc = olms_cd.cd_devs[unit];
if (!sc)
return ENXIO;
if (sc->sc_state & LMS_OPEN)
return EBUSY;
if (clalloc(&sc->sc_q, LMS_BSIZE, 0) == -1)
return ENOMEM;
sc->sc_state |= LMS_OPEN;
sc->sc_status = 0;
sc->sc_x = sc->sc_y = 0;
/* Enable interrupts. */
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LMS_CNTRL, 0);
return 0;
}
int
lmsclose(dev, flag, mode, p)
dev_t dev;
int flag;
int mode;
struct proc *p;
{
struct olms_softc *sc = olms_cd.cd_devs[LMSUNIT(dev)];
/* Disable interrupts. */
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LMS_CNTRL, 0x10);
sc->sc_state &= ~LMS_OPEN;
clfree(&sc->sc_q);
return 0;
}
int
lmsread(dev, uio, flag)
dev_t dev;
struct uio *uio;
int flag;
{
struct olms_softc *sc = olms_cd.cd_devs[LMSUNIT(dev)];
int s;
int error = 0;
size_t length;
u_char buffer[LMS_CHUNK];
/* Block until mouse activity occurred. */
s = spltty();
while (sc->sc_q.c_cc == 0) {
if (flag & IO_NDELAY) {
splx(s);
return EWOULDBLOCK;
}
sc->sc_state |= LMS_ASLP;
error = tsleep((caddr_t)sc, PZERO | PCATCH, "lmsrea", 0);
if (error) {
sc->sc_state &= ~LMS_ASLP;
splx(s);
return error;
}
}
splx(s);
/* Transfer as many chunks as possible. */
while (sc->sc_q.c_cc > 0 && uio->uio_resid > 0) {
length = min(sc->sc_q.c_cc, uio->uio_resid);
if (length > sizeof(buffer))
length = sizeof(buffer);
/* Remove a small chunk from the input queue. */
(void) q_to_b(&sc->sc_q, buffer, length);
/* Copy the data to the user process. */
if ((error = uiomove(buffer, length, uio)) != 0)
break;
}
return error;
}
int
lmsioctl(dev, cmd, addr, flag, p)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
struct proc *p;
{
struct olms_softc *sc = olms_cd.cd_devs[LMSUNIT(dev)];
struct mouseinfo info;
int s;
int error;
switch (cmd) {
case MOUSEIOCREAD:
s = spltty();
info.status = sc->sc_status;
if (sc->sc_x || sc->sc_y)
info.status |= MOVEMENT;
if (sc->sc_x > 127)
info.xmotion = 127;
else if (sc->sc_x < -127)
/* Bounding at -127 avoids a bug in XFree86. */
info.xmotion = -127;
else
info.xmotion = sc->sc_x;
if (sc->sc_y > 127)
info.ymotion = 127;
else if (sc->sc_y < -127)
info.ymotion = -127;
else
info.ymotion = sc->sc_y;
/* Reset historical information. */
sc->sc_x = sc->sc_y = 0;
sc->sc_status &= ~BUTCHNGMASK;
ndflush(&sc->sc_q, sc->sc_q.c_cc);
splx(s);
error = copyout(&info, addr, sizeof(struct mouseinfo));
break;
default:
error = EINVAL;
break;
}
return error;
}
int
olmsintr(arg)
void *arg;
{
struct olms_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
u_char hi, lo, buttons, changed;
char dx, dy;
u_char buffer[5];
if ((sc->sc_state & LMS_OPEN) == 0)
/* Interrupts are not expected. */
return 0;
bus_space_write_1(iot, ioh, LMS_CNTRL, 0xab);
hi = bus_space_read_1(iot, ioh, LMS_DATA);
bus_space_write_1(iot, ioh, LMS_CNTRL, 0x90);
lo = bus_space_read_1(iot, ioh, LMS_DATA);
dx = ((hi & 0x0f) << 4) | (lo & 0x0f);
/* Bounding at -127 avoids a bug in XFree86. */
dx = (dx == -128) ? -127 : dx;
bus_space_write_1(iot, ioh, LMS_CNTRL, 0xf0);
hi = bus_space_read_1(iot, ioh, LMS_DATA);
bus_space_write_1(iot, ioh, LMS_CNTRL, 0xd0);
lo = bus_space_read_1(iot, ioh, LMS_DATA);
dy = ((hi & 0x0f) << 4) | (lo & 0x0f);
dy = (dy == -128) ? 127 : -dy;
bus_space_write_1(iot, ioh, LMS_CNTRL, 0);
buttons = (~hi >> 5) & 0x07;
changed = ((buttons ^ sc->sc_status) & 0x07) << 3;
sc->sc_status = buttons | (sc->sc_status & ~BUTSTATMASK) | changed;
if (dx || dy || changed) {
/* Update accumulated movements. */
sc->sc_x += dx;
sc->sc_y += dy;
/* Add this event to the queue. */
buffer[0] = 0x80 | (buttons ^ BUTSTATMASK);
buffer[1] = dx;
buffer[2] = dy;
buffer[3] = buffer[4] = 0;
(void) b_to_q(buffer, sizeof buffer, &sc->sc_q);
if (sc->sc_state & LMS_ASLP) {
sc->sc_state &= ~LMS_ASLP;
wakeup((caddr_t)sc);
}
selnotify(&sc->sc_rsel, 0);
}
return -1;
}
int
lmspoll(dev, events, p)
dev_t dev;
int events;
struct proc *p;
{
struct olms_softc *sc = olms_cd.cd_devs[LMSUNIT(dev)];
int revents = 0;
int s = spltty();
if (events & (POLLIN | POLLRDNORM)) {
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
selrecord(p, &sc->sc_rsel);
}
splx(s);
return (revents);
}
static void
filt_lmsrdetach(struct knote *kn)
{
struct olms_softc *sc = kn->kn_hook;
int s;
s = spltty();
SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
splx(s);
}
static int
filt_lmsread(struct knote *kn, long hint)
{
struct olms_softc *sc = kn->kn_hook;
kn->kn_data = sc->sc_q.c_cc;
return (kn->kn_data > 0);
}
static const struct filterops lmsread_filtops =
{ 1, NULL, filt_lmsrdetach, filt_lmsread };
int
lmskqfilter(dev_t dev, struct knote *kn)
{
struct olms_softc *sc = olms_cd.cd_devs[LMSUNIT(dev)];
struct klist *klist;
int s;
switch (kn->kn_filter) {
case EVFILT_READ:
klist = &sc->sc_rsel.sel_klist;
kn->kn_fop = &lmsread_filtops;
break;
default:
return (1);
}
kn->kn_hook = sc;
s = spltty();
SLIST_INSERT_HEAD(klist, kn, kn_selnext);
splx(s);
return (0);
}

View File

@ -1,460 +0,0 @@
/* $NetBSD: omms.c,v 1.10 2002/11/26 19:50:26 christos Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
* Copyright (c) 1992, 1993 Erik Forsberg.
* 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.
*
* THIS SOFTWARE IS PROVIDED BY ``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 I 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.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: omms.c,v 1.10 2002/11/26 19:50:26 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/select.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/device.h>
#include <sys/poll.h>
#include <sys/conf.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/bus.h>
#include <machine/mouse.h>
#include <dev/isa/isavar.h>
#define MMS_ADDR 0 /* offset for register select */
#define MMS_DATA 1 /* offset for InPort data */
#define MMS_IDENT 2 /* offset for identification register */
#define MMS_NPORTS 4
#define MMS_CHUNK 128 /* chunk size for read */
#define MMS_BSIZE 1020 /* buffer size */
struct omms_softc { /* driver status information */
struct device sc_dev;
void *sc_ih;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
struct clist sc_q;
struct selinfo sc_rsel;
u_char sc_state; /* mouse driver state */
#define MMS_OPEN 0x01 /* device is open */
#define MMS_ASLP 0x02 /* waiting for mouse data */
u_char sc_status; /* mouse button status */
int sc_x, sc_y; /* accumulated motion in the X,Y axis */
};
int ommsprobe __P((struct device *, struct cfdata *, void *));
void ommsattach __P((struct device *, struct device *, void *));
int ommsintr __P((void *));
CFATTACH_DECL(omms, sizeof(struct omms_softc),
ommsprobe, ommsattach, NULL, NULL);
extern struct cfdriver omms_cd;
dev_type_open(mmsopen);
dev_type_close(mmsclose);
dev_type_read(mmsread);
dev_type_ioctl(mmsioctl);
dev_type_poll(mmspoll);
dev_type_kqfilter(mmskqfilter);
const struct cdevsw omms_cdevsw = {
mmsopen, mmsclose, mmsread, nowrite, mmsioctl,
nostop, notty, mmspoll, nommap, mmskqfilter,
};
#define MMSUNIT(dev) (minor(dev))
int
ommsprobe(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh;
int rv;
if (ia->ia_nio < 1)
return (0);
if (ia->ia_nirq < 1)
return (0);
if (ISA_DIRECT_CONFIG(ia))
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
return 0;
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
return 0;
/* Map the i/o space. */
if (bus_space_map(iot, ia->ia_io[0].ir_addr, MMS_NPORTS, 0, &ioh))
return 0;
rv = 0;
/* Read identification register to see if present */
if (bus_space_read_1(iot, ioh, MMS_IDENT) != 0xde)
goto out;
/* Seems it was there; reset. */
bus_space_write_1(iot, ioh, MMS_ADDR, 0x87);
rv = 1;
ia->ia_nio = 1;
ia->ia_io[0].ir_size = MMS_NPORTS;
ia->ia_nirq = 1;
ia->ia_niomem = 0;
ia->ia_ndrq = 0;
out:
bus_space_unmap(iot, ioh, MMS_NPORTS);
return rv;
}
void
ommsattach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct omms_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh;
printf("\n");
if (bus_space_map(iot, ia->ia_io[0].ir_addr, MMS_NPORTS, 0, &ioh)) {
printf("%s: can't map i/o space\n", sc->sc_dev.dv_xname);
return;
}
/* Other initialization was done by ommsprobe. */
sc->sc_iot = iot;
sc->sc_ioh = ioh;
sc->sc_state = 0;
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
IST_PULSE, IPL_TTY, ommsintr, sc);
}
int
mmsopen(dev, flag, mode, p)
dev_t dev;
int flag;
int mode;
struct proc *p;
{
int unit = MMSUNIT(dev);
struct omms_softc *sc;
if (unit >= omms_cd.cd_ndevs)
return ENXIO;
sc = omms_cd.cd_devs[unit];
if (!sc)
return ENXIO;
if (sc->sc_state & MMS_OPEN)
return EBUSY;
if (clalloc(&sc->sc_q, MMS_BSIZE, 0) == -1)
return ENOMEM;
sc->sc_state |= MMS_OPEN;
sc->sc_status = 0;
sc->sc_x = sc->sc_y = 0;
/* Enable interrupts. */
bus_space_write_1(sc->sc_iot, sc->sc_ioh, MMS_ADDR, 0x07);
bus_space_write_1(sc->sc_iot, sc->sc_ioh, MMS_DATA, 0x09);
return 0;
}
int
mmsclose(dev, flag, mode, p)
dev_t dev;
int flag;
int mode;
struct proc *p;
{
struct omms_softc *sc = omms_cd.cd_devs[MMSUNIT(dev)];
/* Disable interrupts. */
bus_space_write_1(sc->sc_iot, sc->sc_ioh, MMS_ADDR, 0x87);
sc->sc_state &= ~MMS_OPEN;
clfree(&sc->sc_q);
return 0;
}
int
mmsread(dev, uio, flag)
dev_t dev;
struct uio *uio;
int flag;
{
struct omms_softc *sc = omms_cd.cd_devs[MMSUNIT(dev)];
int s;
int error = 0;
size_t length;
u_char buffer[MMS_CHUNK];
/* Block until mouse activity occurred. */
s = spltty();
while (sc->sc_q.c_cc == 0) {
if (flag & IO_NDELAY) {
splx(s);
return EWOULDBLOCK;
}
sc->sc_state |= MMS_ASLP;
error = tsleep((caddr_t)sc, PZERO | PCATCH, "mmsrea", 0);
if (error) {
sc->sc_state &= ~MMS_ASLP;
splx(s);
return error;
}
}
splx(s);
/* Transfer as many chunks as possible. */
while (sc->sc_q.c_cc > 0 && uio->uio_resid > 0) {
length = min(sc->sc_q.c_cc, uio->uio_resid);
if (length > sizeof(buffer))
length = sizeof(buffer);
/* Remove a small chunk from the input queue. */
(void) q_to_b(&sc->sc_q, buffer, length);
/* Copy the data to the user process. */
if ((error = uiomove(buffer, length, uio)) != 0)
break;
}
return error;
}
int
mmsioctl(dev, cmd, addr, flag, p)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
struct proc *p;
{
struct omms_softc *sc = omms_cd.cd_devs[MMSUNIT(dev)];
struct mouseinfo info;
int s;
int error;
switch (cmd) {
case MOUSEIOCREAD:
s = spltty();
info.status = sc->sc_status;
if (sc->sc_x || sc->sc_y)
info.status |= MOVEMENT;
if (sc->sc_x > 127)
info.xmotion = 127;
else if (sc->sc_x < -127)
/* Bounding at -127 avoids a bug in XFree86. */
info.xmotion = -127;
else
info.xmotion = sc->sc_x;
if (sc->sc_y > 127)
info.ymotion = 127;
else if (sc->sc_y < -127)
info.ymotion = -127;
else
info.ymotion = sc->sc_y;
/* Reset historical information. */
sc->sc_x = sc->sc_y = 0;
sc->sc_status &= ~BUTCHNGMASK;
ndflush(&sc->sc_q, sc->sc_q.c_cc);
splx(s);
error = copyout(&info, addr, sizeof(struct mouseinfo));
break;
default:
error = EINVAL;
break;
}
return error;
}
int
ommsintr(arg)
void *arg;
{
struct omms_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
u_char buttons, changed, status;
char dx, dy;
u_char buffer[5];
if ((sc->sc_state & MMS_OPEN) == 0)
/* Interrupts are not expected. */
return 0;
/* Freeze InPort registers (disabling interrupts). */
bus_space_write_1(iot, ioh, MMS_ADDR, 0x07);
bus_space_write_1(iot, ioh, MMS_DATA, 0x29);
bus_space_write_1(iot, ioh, MMS_ADDR, 0x00);
status = bus_space_read_1(iot, ioh, MMS_DATA);
if (status & 0x40) {
bus_space_write_1(iot, ioh, MMS_ADDR, 1);
dx = bus_space_read_1(iot, ioh, MMS_DATA);
dx = (dx == -128) ? -127 : dx;
bus_space_write_1(iot, ioh, MMS_ADDR, 2);
dy = bus_space_read_1(iot, ioh, MMS_DATA);
dy = (dy == -128) ? 127 : -dy;
} else
dx = dy = 0;
/* Unfreeze InPort registers (reenabling interrupts). */
bus_space_write_1(iot, ioh, MMS_ADDR, 0x07);
bus_space_write_1(iot, ioh, MMS_DATA, 0x09);
buttons = status & BUTSTATMASK;
changed = status & BUTCHNGMASK;
sc->sc_status = buttons | (sc->sc_status & ~BUTSTATMASK) | changed;
if (dx || dy || changed) {
/* Update accumulated movements. */
sc->sc_x += dx;
sc->sc_y += dy;
/* Add this event to the queue. */
buffer[0] = 0x80 | (buttons ^ BUTSTATMASK);
buffer[1] = dx;
buffer[2] = dy;
buffer[3] = buffer[4] = 0;
(void) b_to_q(buffer, sizeof buffer, &sc->sc_q);
if (sc->sc_state & MMS_ASLP) {
sc->sc_state &= ~MMS_ASLP;
wakeup((caddr_t)sc);
}
selnotify(&sc->sc_rsel, 0);
}
return -1;
}
int
mmspoll(dev, events, p)
dev_t dev;
int events;
struct proc *p;
{
struct omms_softc *sc = omms_cd.cd_devs[MMSUNIT(dev)];
int revents = 0;
int s = spltty();
if (events & (POLLIN | POLLRDNORM)) {
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
selrecord(p, &sc->sc_rsel);
}
splx(s);
return (revents);
}
static void
filt_mmsrdetach(struct knote *kn)
{
struct omms_softc *sc = kn->kn_hook;
int s;
s = spltty();
SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
splx(s);
}
static int
filt_mmsread(struct knote *kn, long hint)
{
struct omms_softc *sc = kn->kn_hook;
kn->kn_data = sc->sc_q.c_cc;
return (kn->kn_data > 0);
}
static const struct filterops mmsread_filtops =
{ 1, NULL, filt_mmsrdetach, filt_mmsread };
int
mmskqfilter(dev_t dev, struct knote *kn)
{
struct omms_softc *sc = omms_cd.cd_devs[MMSUNIT(dev)];
struct klist *klist;
int s;
switch (kn->kn_filter) {
case EVFILT_READ:
klist = &sc->sc_rsel.sel_klist;
kn->kn_fop = &mmsread_filtops;
break;
default:
return (1);
}
kn->kn_hook = sc;
s = spltty();
SLIST_INSERT_HEAD(klist, kn, kn_selnext);
splx(s);
return (0);
}

View File

@ -1,4 +1,4 @@
# $NetBSD: DEVNAMES,v 1.134 2003/04/17 11:55:08 wiz Exp $
# $NetBSD: DEVNAMES,v 1.135 2003/05/15 13:13:26 wiz Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@ -813,8 +813,6 @@ ofrtc MI
ohci MI
oldscsi pmax Attribute
oldscsibus pmax
olms i386
omms i386
oosiop MI
openfirm macppc
openfirm ofppc