Remove old (non-wsmouse) pms driver. aaron@ ok.

3 files changed, 2 insertions, 620 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7be754fd7b3..e9feafd033a 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.242 2001/02/20 23:04:06 jbm Exp $
+#	$OpenBSD: GENERIC,v 1.243 2001/02/21 20:40:02 jbm Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -174,7 +174,6 @@ lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
 lms1	at isa? port 0x238 irq 5
 mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
 mms1	at isa? port 0x238 irq 5
-#pms0  at pckbcport? irq 12		# PS/2 auxiliary port mouse
 
 wsmouse*	at lms? mux 0
 wsmouse*	at mms? mux 0
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index a8ced2ef537..4d081bd35de 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.74 2001/01/30 00:00:29 aaron Exp $
+#	$OpenBSD: files.i386,v 1.75 2001/02/21 20:40:02 jbm Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -159,10 +159,6 @@ file	arch/i386/isa/lms.c		lms needs-flag
 device	mms: wsmousedev
 attach	mms at isa
 file	arch/i386/isa/mms.c		mms needs-flag
-device	opms
-attach	opms at pckbcport with opms_hack
-attach	opms at pckbc with opms_pckbc
-file	arch/i386/isa/pms.c		opms | opms_hack | opms_pckbc needs-flag
 
 include	"dev/wscons/files.wscons"
 include	"dev/pckbc/files.pckbc"
diff --git a/sys/arch/i386/isa/pms.c b/sys/arch/i386/isa/pms.c
deleted file mode 100644
index 3d2e16a0faf..00000000000
--- a/sys/arch/i386/isa/pms.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*	$OpenBSD: pms.c,v 1.28 2000/12/19 06:58:39 csapuntz Exp $	*/
-/*	$NetBSD: pms.c,v 1.29 1996/05/12 23:12:42 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 1996, Jason Downs.
- * Copyright (c) 1994 Charles 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.
- */
-
-/*
- * XXXX
- * This is a hack.  This driver should really be combined with the
- * keyboard driver, since they go through the same buffer and use the
- * same I/O ports.  Frobbing the mouse and keyboard at the same time
- * may result in dropped characters and/or corrupted mouse events.
- */
-
-#include "pms.h"
-#if NPMS > 1
-#error Only one PS/2 style mouse may be configured into your system.
-#endif
-
-#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/signalvar.h>
-#include <sys/vnode.h>
-#include <sys/device.h>
-
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/pio.h>
-#include <machine/mouse.h>
-#include <machine/conf.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/rndvar.h>
-
-#define	PMS_DATA	0x60	/* offset for data port, read-write */
-#define	PMS_CNTRL	0x64	/* offset for control port, write-only */
-#define	PMS_STATUS	0x64	/* offset for status port, read-only */
-#define	PMS_NPORTS	8
-
-/* status bits */
-#define	PMS_OBUF_FULL	0x01
-#define	PMS_IBUF_FULL	0x02
-
-/* controller commands */
-#define	PMS_INT_ENABLE	0x47	/* enable controller interrupts */
-#define	PMS_INT_DISABLE	0x45	/* disable controller interrupts */
-#define	PMS_AUX_ENABLE	0xa8	/* enable auxiliary port */
-#define	PMS_AUX_DISABLE	0xa7	/* disable auxiliary port */
-#define	PMS_AUX_TEST	0xa9	/* test auxiliary port */
-
-#define	PMS_8042_CMD	0x65
-
-/* mouse commands */
-#define	PMS_SET_SCALE11	0xe6	/* set scaling 1:1 */
-#define	PMS_SET_SCALE21 0xe7	/* set scaling 2:1 */
-#define	PMS_SET_RES	0xe8	/* set resolution */
-#define	PMS_GET_SCALE	0xe9	/* get scaling factor */
-#define	PMS_SET_STREAM	0xea	/* set streaming mode */
-#define	PMS_SET_SAMPLE	0xf3	/* set sampling rate */
-#define	PMS_DEV_ENABLE	0xf4	/* mouse on */
-#define	PMS_DEV_DISABLE	0xf5	/* mouse off */
-#define	PMS_RESET	0xff	/* reset */
-
-#define	PMS_CHUNK	128	/* chunk size for read */
-#define	PMS_BSIZE	1020	/* buffer size */
-
-struct pms_softc {		/* driver status information */
-	struct device sc_dev;
-	void *sc_ih;
-
-	struct clist sc_q;
-	struct selinfo sc_rsel;
-	struct proc *sc_io;	/* process that opened pms (can get SIGIO) */
-	char   sc_async;	/* send SIGIO on input ready */
-	u_char sc_state;	/* mouse driver state */
-#define	PMS_OPEN	0x01	/* device is open */
-#define	PMS_ASLP	0x02	/* waiting for mouse data */
-	u_char sc_flags;	/* mouse driver flags */
-#define PMS_RAW		0x01	/* device is in raw mode */
-	u_char sc_status;	/* mouse button status */
-	int sc_x, sc_y;		/* accumulated motion in the X,Y axis */
-};
-
-int pmsprobe __P((struct device *, void *, void *));
-void pmsattach __P((struct device *, struct device *, void *));
-int pmsintr __P((void *));
-
-struct cfattach pms_ca = {
-	sizeof(struct pms_softc), pmsprobe, pmsattach,
-};
-
-struct cfdriver pms_cd = {
-	NULL, "pms", DV_TTY
-};
-
-#define	PMSUNIT(dev)	(minor(dev) / 2)
-#define PMSTYPE(dev)	(minor(dev) % 2)
-
-#define	FLUSHQ(q) {							\
-	if ((q)->c_cc)							\
-		ndflush(q, (q)->c_cc);					\
-}
-
-static __inline void pms_flush __P((void));
-static __inline void pms_dev_cmd __P((u_char));
-static __inline void pms_pit_cmd __P((u_char));
-static __inline void pms_aux_cmd __P((u_char));
-
-static __inline void
-pms_flush()
-{
-	u_char c;
-
-	while ((c = inb(PMS_STATUS) & 0x03) != 0)
-		if ((c & PMS_OBUF_FULL) == PMS_OBUF_FULL) {
-			/* XXX - delay is needed to prevent some keyboards from
-			   wedging when the system boots */
-			delay(6);
-			(void) inb(PMS_DATA);
-		}
-}
-
-static __inline void
-pms_dev_cmd(value)
-	u_char value;
-{
-
-	pms_flush();
-	outb(PMS_CNTRL, 0xd4);
-	pms_flush();
-	outb(PMS_DATA, value);
-}
-
-static __inline void
-pms_aux_cmd(value)
-	u_char value;
-{
-
-	pms_flush();
-	outb(PMS_CNTRL, value);
-}
-
-static __inline void
-pms_pit_cmd(value)
-	u_char value;
-{
-
-	pms_flush();
-	outb(PMS_CNTRL, 0x60);
-	pms_flush();
-	outb(PMS_DATA, value);
-}
-
-/*
- * XXX needs more work yet.  We should have a `pckbd_attach_args' that
- * provides the parent's io port and our irq.
- */
-int
-pmsprobe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
-{
-	struct cfdata *cf = match;
-	u_char x;
-
-	/*
-	 * We only attach to the keyboard controller via
-	 * the console drivers. (We really wish we could be the
-	 * child of a real keyboard controller driver.)
-	 */
-	if ((parent == NULL) ||
-	   ((strcmp(parent->dv_cfdata->cf_driver->cd_name, "pc") != 0) &&
-	    (strcmp(parent->dv_cfdata->cf_driver->cd_name, "vt") != 0)))
-		return (0);
-
-	/* Can't wildcard IRQ. */
-	if (cf->cf_loc[0] == -1)
-		return (0);
-
-	/*pms_dev_cmd(PMS_RESET);*/
-	pms_aux_cmd(PMS_AUX_TEST);
-	delay(4000);
-	x = inb(PMS_DATA);
-	pms_pit_cmd(PMS_INT_DISABLE);
-	if (x & 0x04)
-		return (0);
-
-	/* Make sure the IRQ is available. */
-	if (!isa_intr_check((isa_chipset_tag_t)0, cf->cf_loc[0], IST_EDGE)) {
-		printf ("%s%d: irq %d already in use\n", cf->cf_driver->cd_name,
-		    cf->cf_unit, cf->cf_loc[0]);
-		return (0);
-	}
-
-	return (1);
-}
-
-void
-pmsattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	struct pms_softc *sc = (void *)self;
-	int irq = self->dv_cfdata->cf_loc[0];
-	isa_chipset_tag_t ic = aux;			/* XXX */
-
-	printf(" irq %d", irq);
-#ifdef INTELLIMOUSE
-	printf(": IntelliMouse");
-#endif
-	printf("\n");
-
-	/* Other initialization was done by pmsprobe. */
-	sc->sc_state = 0;
-
-	sc->sc_ih = isa_intr_establish(ic, irq, IST_EDGE, IPL_TTY,
-	    pmsintr, sc, sc->sc_dev.dv_xname);
-
-	pms_pit_cmd(PMS_INT_ENABLE);
-}
-
-int
-pmsopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag;
-	int mode;
-	struct proc *p;
-{
-	int unit = PMSUNIT(dev);
-	struct pms_softc *sc;
-
-	if (unit >= pms_cd.cd_ndevs)
-		return ENXIO;
-	sc = pms_cd.cd_devs[unit];
-	if (!sc)
-		return ENXIO;
-
-	if (sc->sc_state & PMS_OPEN)
-		return EBUSY;
-
-	if (clalloc(&sc->sc_q, PMS_BSIZE, 0) == -1)
-		return ENOMEM;
-
-	sc->sc_state |= PMS_OPEN;
-	sc->sc_status = 0;
-	sc->sc_flags = (PMSTYPE(dev) ? PMS_RAW : 0);
-	sc->sc_x = sc->sc_y = 0;
-	sc->sc_async = 0;
-	sc->sc_io = p;
-
-	/* Enable interrupts. */
-	pms_dev_cmd(PMS_DEV_ENABLE);
-	pms_aux_cmd(PMS_AUX_ENABLE);
-#if 0
-	pms_dev_cmd(PMS_SET_RES);
-	pms_dev_cmd(3);		/* 8 counts/mm */
-	pms_dev_cmd(PMS_SET_SCALE21);
-	pms_dev_cmd(PMS_SET_SAMPLE);
-	pms_dev_cmd(100);	/* 100 samples/sec */
-	pms_dev_cmd(PMS_SET_STREAM);
-#endif
-#ifdef INTELLIMOUSE
-	/* The Micro$oft IntelliMouse has a wheel that you can turn or
-	 * click stuck in between the left and right buttons.
-	 * By default this mouse acts like a two-button PS/2 mouse.
-	 * If you set the sampling rate to 200, then 100, then 80
-	 * it changes to a 4-byte-per-packet format and the wheel
-	 * acts like a middle button if you click it.  Turing the
-	 * wheel modifies the fourth byte in the packet.
-	 */
-	pms_dev_cmd(PMS_SET_SAMPLE);
-	pms_dev_cmd(200);	/* 200 samples/sec */
-	pms_dev_cmd(PMS_SET_SAMPLE);
-	pms_dev_cmd(100);	/* 100 samples/sec */
-	pms_dev_cmd(PMS_SET_SAMPLE);
-	pms_dev_cmd(80);	/* 80 samples/sec */
-#endif
-	pms_pit_cmd(PMS_INT_ENABLE);
-
-	return 0;
-}
-
-int
-pmsclose(dev, flag, mode, p)
-	dev_t dev;
-	int flag;
-	int mode;
-	struct proc *p;
-{
-	struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
-
-	/* Disable interrupts. */
-	/* pms_dev_cmd(PMS_DEV_DISABLE); */
-#if 0
-	pms_pit_cmd(PMS_INT_DISABLE);
-	pms_aux_cmd(PMS_AUX_DISABLE);
-#endif
-	sc->sc_state &= ~PMS_OPEN;
-	sc->sc_io = NULL;
-
-	clfree(&sc->sc_q);
-
-	return 0;
-}
-
-int
-pmsread(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
-{
-	struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
-	int s;
-	int error = 0;
-	size_t length;
-	u_char buffer[PMS_CHUNK];
-
-	/* Block until mouse activity occured. */
-
-	s = spltty();
-	while (sc->sc_q.c_cc == 0) {
-		if (flag & IO_NDELAY) {
-			splx(s);
-			return EWOULDBLOCK;
-		}
-		sc->sc_state |= PMS_ASLP;
-		error = tsleep((caddr_t)sc, PZERO | PCATCH, "pmsrea", 0);
-		if (error) {
-			sc->sc_state &= ~PMS_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
-pmswrite(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
-{
-	struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
-	int i, n;
-	int error;
-	int s;
-	u_char wrbuf[32];
-
-
-	if (!(sc->sc_flags & PMS_RAW)) 
-	    return ENODEV;
-	
-	error = 0;
-	/* Only allow a small number of bytes per write. */
-	n = min(sizeof(wrbuf), uio->uio_resid);
-	error = uiomove(wrbuf, n, uio);
-	if (error)
-		return error;
-	s = spltty();
-	for(i = 0; i < n; i++)
-		pms_dev_cmd(wrbuf[i]);
-	splx(s);
-
-	return error;
-}
-
-int
-pmsioctl(dev, cmd, addr, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t addr;
-	int flag;
-	struct proc *p;
-{
-	struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
-	struct mouseinfo info;
-	int s;
-	int error;
-
-	error = 0;
-	switch (cmd) {
-
-	case FIONBIO:		/* we will remove this someday (soon???) */
-		return (0);
-
-	case FIOASYNC:
-		sc->sc_async = *(int *)addr != 0;
-		break;
-
-	case TIOCSPGRP:
-		if (*(int *)addr != sc->sc_io->p_pgid)
-			return (EPERM);
-		break;
-
-	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;
-	case MOUSEIOCSRAW:
-		if (!(sc->sc_flags & PMS_RAW)) {
-			FLUSHQ(&sc->sc_q);
-			sc->sc_flags |= PMS_RAW;
-		}
-		break;
-	case MOUSEIOCSCOOKED:
-		if (sc->sc_flags & PMS_RAW) {
-			FLUSHQ(&sc->sc_q);
-			sc->sc_flags &= ~PMS_RAW;
-		}
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-
-	return error;
-}
-
-/* Masks for the first byte of a packet */
-#define PS2LBUTMASK 0x01
-#define PS2RBUTMASK 0x02
-#define PS2MBUTMASK 0x04
-
-int
-pmsintr(arg)
-	void *arg;
-{
-	struct pms_softc *sc = arg;
-	static int state = 0;
-	static u_char buttons;
-	u_char changed;
-	static char dx, dy;
-	u_char buffer[5];
-
-	if ((sc->sc_state & PMS_OPEN) == 0) {
-		/* Interrupts are not expected.  Discard the byte. */
-		pms_flush();
-		return 0;
-	}
-
-	if (!(sc->sc_flags & PMS_RAW)) {
-		switch (state) {
-		case 0:
-			buttons = inb(PMS_DATA);
-			if ((buttons & 0xc0) == 0)
-				++state;
-			break;
-		case 1:
-			dx = inb(PMS_DATA);
-			/* Bounding at -127 avoids a bug in XFree86. */
-			dx = (dx == -128) ? -127 : dx;
-			++state;
-			break;
-		case 2:
-			dy = inb(PMS_DATA);
-			dy = (dy == -128) ? -127 : dy;
-#ifdef INTELLIMOUSE
-			++state;
-#else
-			state = 0;
-#endif
-			buttons = ((buttons & PS2LBUTMASK) << 2) |
-			  	((buttons & (PS2RBUTMASK | PS2MBUTMASK)) >> 1);
-			changed = ((buttons ^ sc->sc_status) & BUTSTATMASK) << 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);
-				add_mouse_randomness(*(u_int32_t*)buffer);
-
-				if (sc->sc_state & PMS_ASLP) {
-					sc->sc_state &= ~PMS_ASLP;
-					wakeup((caddr_t)sc);
-				}
-				selwakeup(&sc->sc_rsel);
-				if (sc->sc_async) {
-				    	psignal(sc->sc_io, SIGIO); 
-				}
-
-			}
-
-			break;
-#ifdef INTELLIMOUSE		/* discard fourth "wheel" byte */
-		case 3:
-			state = 0;
-			inb(PMS_DATA);
-			break;
-#endif
-		}
-	} else {
-		buffer[0] = inb(PMS_DATA);
-		(void) b_to_q(buffer, 1, &sc->sc_q);
-		add_mouse_randomness(*(u_int32_t*)buffer);
-		
-		if (sc->sc_state & PMS_ASLP) {
-			sc->sc_state &= ~PMS_ASLP;
-			wakeup((caddr_t)sc);
-		}
-		selwakeup(&sc->sc_rsel);
-		if (sc->sc_async) {
-		    	psignal(sc->sc_io, SIGIO); 
-		}
-
-	}
-
-	return -1;
-}
-
-int
-pmsselect(dev, rw, p)
-	dev_t dev;
-	int rw;
-	struct proc *p;
-{
-	struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
-	int s;
-	int ret;
-
-	if (rw == FWRITE)
-		return 0;
-
-	s = spltty();
-	if (!sc->sc_q.c_cc) {
-		selrecord(p, &sc->sc_rsel);
-		ret = 0;
-	} else
-		ret = 1;
-	splx(s);
-
-	return ret;
-}