8 files changed, 4 insertions, 1109 deletions

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index f7a86cf5ee49f..67e8573e5164c 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -278,8 +278,6 @@ dev/ipmi/ipmi_ssif.c		optional ipmi smbus
 dev/ipmi/ipmi_pci.c		optional ipmi pci
 dev/ipmi/ipmi_linux.c		optional ipmi compat_linux
 dev/le/if_le_isa.c		optional le isa
-dev/mse/mse.c			optional mse
-dev/mse/mse_isa.c		optional mse isa
 dev/nctgpio/nctgpio.c		optional nctgpio
 dev/nfe/if_nfe.c		optional nfe pci
 dev/ntb/if_ntb/if_ntb.c		optional if_ntb
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
deleted file mode 100644
index 27a36f219ce03..0000000000000
--- a/sys/dev/mse/mse.c
+++ /dev/null
@@ -1,566 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2004 M. Warner Losh
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-/*
- * Copyright 1992 by the University of Guelph
- *
- * Permission to use, copy and modify this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation.
- * University of Guelph makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-/*
- * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
- * the X386 port, courtesy of
- * Rick Macklem, rick@snowhite.cis.uoguelph.ca
- * Caveats: The driver currently uses spltty(), but doesn't use any
- * generic tty code. It could use splmse() (that only masks off the
- * bus mouse interrupt, but that would require hacking in i386/isa/icu.s.
- * (This may be worth the effort, since the Logitech generates 30/60
- * interrupts/sec continuously while it is open.)
- * NB: The ATI has NOT been tested yet!
- */
-
-/*
- * Modification history:
- * Sep 6, 1994 -- Lars Fredriksen(fredriks@mcs.com)
- *   improved probe based on input from Logitech.
- *
- * Oct 19, 1992 -- E. Stark (stark@cs.sunysb.edu)
- *   fixes to make it work with Microsoft InPort busmouse
- *
- * Jan, 1993 -- E. Stark (stark@cs.sunysb.edu)
- *   added patches for new "select" interface
- *
- * May 4, 1993 -- E. Stark (stark@cs.sunysb.edu)
- *   changed position of some spl()'s in mseread
- *
- * October 8, 1993 -- E. Stark (stark@cs.sunysb.edu)
- *   limit maximum negative x/y value to -127 to work around XFree problem
- *   that causes spurious button pushes.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/poll.h>
-#include <sys/selinfo.h>
-#include <sys/uio.h>
-#include <sys/mouse.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <isa/isavar.h>
-
-#include <dev/mse/msevar.h>
-
-devclass_t	mse_devclass;
-
-static	d_open_t	mseopen;
-static	d_close_t	mseclose;
-static	d_read_t	mseread;
-static  d_ioctl_t	mseioctl;
-static	d_poll_t	msepoll;
-
-static struct cdevsw mse_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_open =	mseopen,
-	.d_close =	mseclose,
-	.d_read =	mseread,
-	.d_ioctl =	mseioctl,
-	.d_poll =	msepoll,
-	.d_name =	"mse",
-};
-
-static	void		mseintr(void *);
-static	void		mseintr_locked(mse_softc_t *sc);
-static	void		msetimeout(void *);
-
-#define	MSE_NBLOCKIO(dev)	(dev2unit(dev) != 0)
-
-#define	MSEPRI	(PZERO + 3)
-
-int
-mse_common_attach(device_t dev)
-{
-	mse_softc_t *sc;
-	int unit, flags, rid;
-
-	sc = device_get_softc(dev);
-	unit = device_get_unit(dev);
-	mtx_init(&sc->sc_lock, "mse", NULL, MTX_DEF);
-	callout_init_mtx(&sc->sc_callout, &sc->sc_lock, 0);
-
-	rid = 0;
-	sc->sc_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
-					     RF_ACTIVE);
-	if (sc->sc_intr == NULL) {
-		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
-		mtx_destroy(&sc->sc_lock);
-		return ENXIO;
-	}
-
-	if (bus_setup_intr(dev, sc->sc_intr, INTR_TYPE_TTY | INTR_MPSAFE,
-	    NULL, mseintr, sc, &sc->sc_ih)) {
-		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
-		bus_release_resource(dev, SYS_RES_IRQ, rid, sc->sc_intr);
-		mtx_destroy(&sc->sc_lock);
-		return ENXIO;
-	}
-	flags = device_get_flags(dev);
-	sc->mode.accelfactor = (flags & MSE_CONFIG_ACCEL) >> 4;
-
-	sc->sc_dev = make_dev(&mse_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-	    "mse%d", unit);
-	sc->sc_dev->si_drv1 = sc;
-	sc->sc_ndev = make_dev(&mse_cdevsw, 1, UID_ROOT, GID_WHEEL, 0600,
-	    "nmse%d", unit);
-	sc->sc_ndev->si_drv1 = sc;
-	gone_in_dev(dev, 12, "mse(4) driver");
-
-	return 0;
-}
-
-int
-mse_detach(device_t dev)
-{
-	mse_softc_t *sc;
-	int rid;
-
-	sc = device_get_softc(dev);
-	MSE_LOCK(sc);
-	if (sc->sc_flags & MSESC_OPEN) {
-		MSE_UNLOCK(sc);
-		return EBUSY;
-	}
-
-	/* Sabotage subsequent opens. */
-	sc->sc_mousetype = MSE_NONE;
-	MSE_UNLOCK(sc);
-
-	destroy_dev(sc->sc_dev);
-	destroy_dev(sc->sc_ndev);
-
-	rid = 0;
-	bus_teardown_intr(dev, sc->sc_intr, sc->sc_ih);
-	bus_release_resource(dev, SYS_RES_IRQ, rid, sc->sc_intr);
-	bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
-
-	callout_drain(&sc->sc_callout);
-	mtx_destroy(&sc->sc_lock);
-
-	return 0;
-}
-
-/*
- * Exclusive open the mouse, initialize it and enable interrupts.
- */
-static	int
-mseopen(struct cdev *dev, int flags, int fmt, struct thread *td)
-{
-	mse_softc_t *sc = dev->si_drv1;
-
-	MSE_LOCK(sc);
-	if (sc->sc_mousetype == MSE_NONE) {
-		MSE_UNLOCK(sc);
-		return (ENXIO);
-	}
-	if (sc->sc_flags & MSESC_OPEN) {
-		MSE_UNLOCK(sc);
-		return (EBUSY);
-	}
-	sc->sc_flags |= MSESC_OPEN;
-	sc->sc_obuttons = sc->sc_buttons = MOUSE_MSC_BUTTONS;
-	sc->sc_deltax = sc->sc_deltay = 0;
-	sc->sc_bytesread = sc->mode.packetsize = MOUSE_MSC_PACKETSIZE;
-	sc->sc_watchdog = FALSE;
-	callout_reset(&sc->sc_callout, hz * 2, msetimeout, dev);
-	sc->mode.level = 0;
-	sc->status.flags = 0;
-	sc->status.button = sc->status.obutton = 0;
-	sc->status.dx = sc->status.dy = sc->status.dz = 0;
-
-	/*
-	 * Initialize mouse interface and enable interrupts.
-	 */
-	(*sc->sc_enablemouse)(sc->sc_port);
-	MSE_UNLOCK(sc);
-	return (0);
-}
-
-/*
- * mseclose: just turn off mouse innterrupts.
- */
-static	int
-mseclose(struct cdev *dev, int flags, int fmt, struct thread *td)
-{
-	mse_softc_t *sc = dev->si_drv1;
-
-	MSE_LOCK(sc);
-	callout_stop(&sc->sc_callout);
-	(*sc->sc_disablemouse)(sc->sc_port);
-	sc->sc_flags &= ~MSESC_OPEN;
-	MSE_UNLOCK(sc);
-	return(0);
-}
-
-/*
- * mseread: return mouse info using the MSC serial protocol, but without
- * using bytes 4 and 5.
- * (Yes this is cheesy, but it makes the X386 server happy, so...)
- */
-static	int
-mseread(struct cdev *dev, struct uio *uio, int ioflag)
-{
-	mse_softc_t *sc = dev->si_drv1;
-	int xfer, error;
-
-	/*
-	 * If there are no protocol bytes to be read, set up a new protocol
-	 * packet.
-	 */
-	MSE_LOCK(sc);
-	while (sc->sc_flags & MSESC_READING) {
-		if (MSE_NBLOCKIO(dev)) {
-			MSE_UNLOCK(sc);
-			return (0);
-		}
-		sc->sc_flags |= MSESC_WANT;
-		error = mtx_sleep(sc, &sc->sc_lock, MSEPRI | PCATCH, "mseread",
-		    0);
-		if (error) {
-			MSE_UNLOCK(sc);
-			return (error);
-		}
-	}
-	sc->sc_flags |= MSESC_READING;
-	xfer = 0;
-	if (sc->sc_bytesread >= sc->mode.packetsize) {
-		while (sc->sc_deltax == 0 && sc->sc_deltay == 0 &&
-		       (sc->sc_obuttons ^ sc->sc_buttons) == 0) {
-			if (MSE_NBLOCKIO(dev))
-				goto out;
-			sc->sc_flags |= MSESC_WANT;
-			error = mtx_sleep(sc, &sc->sc_lock, MSEPRI | PCATCH,
-				"mseread", 0);
-			if (error)
-				goto out;
-		}
-
-		/*
-		 * Generate protocol bytes.
-		 * For some reason X386 expects 5 bytes but never uses
-		 * the fourth or fifth?
-		 */
-		sc->sc_bytes[0] = sc->mode.syncmask[1] 
-		    | (sc->sc_buttons & ~sc->mode.syncmask[0]);
-		if (sc->sc_deltax > 127)
-			sc->sc_deltax = 127;
-		if (sc->sc_deltax < -127)
-			sc->sc_deltax = -127;
-		sc->sc_deltay = -sc->sc_deltay;	/* Otherwise mousey goes wrong way */
-		if (sc->sc_deltay > 127)
-			sc->sc_deltay = 127;
-		if (sc->sc_deltay < -127)
-			sc->sc_deltay = -127;
-		sc->sc_bytes[1] = sc->sc_deltax;
-		sc->sc_bytes[2] = sc->sc_deltay;
-		sc->sc_bytes[3] = sc->sc_bytes[4] = 0;
-		sc->sc_bytes[5] = sc->sc_bytes[6] = 0;
-		sc->sc_bytes[7] = MOUSE_SYS_EXTBUTTONS;
-		sc->sc_obuttons = sc->sc_buttons;
-		sc->sc_deltax = sc->sc_deltay = 0;
-		sc->sc_bytesread = 0;
-	}
-	xfer = min(uio->uio_resid, sc->mode.packetsize - sc->sc_bytesread);
-	MSE_UNLOCK(sc);
-	error = uiomove(&sc->sc_bytes[sc->sc_bytesread], xfer, uio);
-	MSE_LOCK(sc);
-out:
-	sc->sc_flags &= ~MSESC_READING;
-	if (error == 0)
-		sc->sc_bytesread += xfer;
-	if (sc->sc_flags & MSESC_WANT) {
-		sc->sc_flags &= ~MSESC_WANT;
-		MSE_UNLOCK(sc);
-		wakeup(sc);
-	} else
-		MSE_UNLOCK(sc);
-	return (error);
-}
-
-/*
- * mseioctl: process ioctl commands.
- */
-static int
-mseioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
-{
-	mse_softc_t *sc = dev->si_drv1;
-	mousestatus_t status;
-	int err = 0;
-
-	switch (cmd) {
-
-	case MOUSE_GETHWINFO:
-		MSE_LOCK(sc);
-		*(mousehw_t *)addr = sc->hw;
-		if (sc->mode.level == 0)
-			((mousehw_t *)addr)->model = MOUSE_MODEL_GENERIC;
-		MSE_UNLOCK(sc);
-		break;
-
-	case MOUSE_GETMODE:
-		MSE_LOCK(sc);
-		*(mousemode_t *)addr = sc->mode;
-		switch (sc->mode.level) {
-		case 0:
-			break;
-		case 1:
-			((mousemode_t *)addr)->protocol = MOUSE_PROTO_SYSMOUSE;
-	    		((mousemode_t *)addr)->syncmask[0] = MOUSE_SYS_SYNCMASK;
-	    		((mousemode_t *)addr)->syncmask[1] = MOUSE_SYS_SYNC;
-			break;
-		}
-		MSE_UNLOCK(sc);
-		break;
-
-	case MOUSE_SETMODE:
-		switch (((mousemode_t *)addr)->level) {
-		case 0:
-		case 1:
-			break;
-		default:
-			return (EINVAL);
-		}
-		MSE_LOCK(sc);
-		if (((mousemode_t *)addr)->accelfactor < -1) {
-			MSE_UNLOCK(sc);
-			return (EINVAL);
-		} else if (((mousemode_t *)addr)->accelfactor >= 0)
-			sc->mode.accelfactor = 
-			    ((mousemode_t *)addr)->accelfactor;
-		sc->mode.level = ((mousemode_t *)addr)->level;
-		switch (sc->mode.level) {
-		case 0:
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_MSC_PACKETSIZE;
-			break;
-		case 1:
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_SYS_PACKETSIZE;
-			break;
-		}
-		MSE_UNLOCK(sc);
-		break;
-
-	case MOUSE_GETLEVEL:
-		MSE_LOCK(sc);
-		*(int *)addr = sc->mode.level;
-		MSE_UNLOCK(sc);
-		break;
-
-	case MOUSE_SETLEVEL:
-		switch (*(int *)addr) {
-		case 0:
-			MSE_LOCK(sc);
-			sc->mode.level = *(int *)addr;
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_MSC_PACKETSIZE;
-			MSE_UNLOCK(sc);
-			break;
-		case 1:
-			MSE_LOCK(sc);
-			sc->mode.level = *(int *)addr;
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_SYS_PACKETSIZE;
-			MSE_UNLOCK(sc);
-			break;
-		default:
-			return (EINVAL);
-		}
-		break;
-
-	case MOUSE_GETSTATUS:
-		MSE_LOCK(sc);
-		status = sc->status;
-		sc->status.flags = 0;
-		sc->status.obutton = sc->status.button;
-		sc->status.button = 0;
-		sc->status.dx = 0;
-		sc->status.dy = 0;
-		sc->status.dz = 0;
-		MSE_UNLOCK(sc);
-		*(mousestatus_t *)addr = status;
-		break;
-
-	case MOUSE_READSTATE:
-	case MOUSE_READDATA:
-		return (ENODEV);
-
-	default:
-		return (ENOTTY);
-	}
-	return (err);
-}
-
-/*
- * msepoll: check for mouse input to be processed.
- */
-static	int
-msepoll(struct cdev *dev, int events, struct thread *td)
-{
-	mse_softc_t *sc = dev->si_drv1;
-	int revents = 0;
-
-	MSE_LOCK(sc);
-	if (events & (POLLIN | POLLRDNORM)) {
-		if (sc->sc_bytesread != sc->mode.packetsize ||
-		    sc->sc_deltax != 0 || sc->sc_deltay != 0 ||
-		    (sc->sc_obuttons ^ sc->sc_buttons) != 0)
-			revents |= events & (POLLIN | POLLRDNORM);
-		else
-			selrecord(td, &sc->sc_selp);
-	}
-	MSE_UNLOCK(sc);
-	return (revents);
-}
-
-/*
- * msetimeout: watchdog timer routine.
- */
-static void
-msetimeout(void *arg)
-{
-	struct cdev *dev;
-	mse_softc_t *sc;
-
-	dev = (struct cdev *)arg;
-	sc = dev->si_drv1;
-	MSE_ASSERT_LOCKED(sc);
-	if (sc->sc_watchdog) {
-		if (bootverbose)
-			printf("%s: lost interrupt?\n", devtoname(dev));
-		mseintr_locked(sc);
-	}
-	sc->sc_watchdog = TRUE;
-	callout_schedule(&sc->sc_callout, hz);
-}
-
-/*
- * mseintr: update mouse status. sc_deltax and sc_deltay are accumulative.
- */
-static void
-mseintr(void *arg)
-{
-	mse_softc_t *sc = arg;
-
-	MSE_LOCK(sc);
-	mseintr_locked(sc);
-	MSE_UNLOCK(sc);
-}
-
-static void
-mseintr_locked(mse_softc_t *sc)
-{
-	/*
-	 * the table to turn MouseSystem button bits (MOUSE_MSC_BUTTON?UP)
-	 * into `mousestatus' button bits (MOUSE_BUTTON?DOWN).
-	 */
-	static int butmap[8] = {
-		0, 
-		MOUSE_BUTTON3DOWN, 
-		MOUSE_BUTTON2DOWN, 
-		MOUSE_BUTTON2DOWN | MOUSE_BUTTON3DOWN, 
-		MOUSE_BUTTON1DOWN, 
-		MOUSE_BUTTON1DOWN | MOUSE_BUTTON3DOWN, 
-		MOUSE_BUTTON1DOWN | MOUSE_BUTTON2DOWN,
-        	MOUSE_BUTTON1DOWN | MOUSE_BUTTON2DOWN | MOUSE_BUTTON3DOWN
-	};
-	int dx, dy, but;
-	int sign;
-
-#ifdef DEBUG
-	static int mse_intrcnt = 0;
-	if((mse_intrcnt++ % 10000) == 0)
-		printf("mseintr\n");
-#endif /* DEBUG */
-	if ((sc->sc_flags & MSESC_OPEN) == 0)
-		return;
-
-	(*sc->sc_getmouse)(sc->sc_port, &dx, &dy, &but);
-	if (sc->mode.accelfactor > 0) {
-		sign = (dx < 0);
-		dx = dx * dx / sc->mode.accelfactor;
-		if (dx == 0)
-			dx = 1;
-		if (sign)
-			dx = -dx;
-		sign = (dy < 0);
-		dy = dy * dy / sc->mode.accelfactor;
-		if (dy == 0)
-			dy = 1;
-		if (sign)
-			dy = -dy;
-	}
-	sc->sc_deltax += dx;
-	sc->sc_deltay += dy;
-	sc->sc_buttons = but;
-
-	but = butmap[~but & MOUSE_MSC_BUTTONS];
-	sc->status.dx += dx;
-	sc->status.dy += dy;
-	sc->status.flags |= ((dx || dy) ? MOUSE_POSCHANGED : 0)
-	    | (sc->status.button ^ but);
-	sc->status.button = but;
-
-	sc->sc_watchdog = FALSE;
-
-	/*
-	 * If mouse state has changed, wake up anyone wanting to know.
-	 */
-	if (sc->sc_deltax != 0 || sc->sc_deltay != 0 ||
-	    (sc->sc_obuttons ^ sc->sc_buttons) != 0) {
-		if (sc->sc_flags & MSESC_WANT) {
-			sc->sc_flags &= ~MSESC_WANT;
-			wakeup(sc);
-		}
-		selwakeuppri(&sc->sc_selp, MSEPRI);
-	}
-}
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
deleted file mode 100644
index 5013926c3ebe7..0000000000000
--- a/sys/dev/mse/mse_isa.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2004 M. Warner Losh
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-/*-
- * Copyright 1992 by the University of Guelph
- *
- * Permission to use, copy and modify this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation.
- * University of Guelph makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-/*
- * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
- * the X386 port, courtesy of
- * Rick Macklem, rick@snowhite.cis.uoguelph.ca
- * Caveats: The driver currently uses spltty(), but doesn't use any
- * generic tty code. It could use splmse() (that only masks off the
- * bus mouse interrupt, but that would require hacking in i386/isa/icu.s.
- * (This may be worth the effort, since the Logitech generates 30/60
- * interrupts/sec continuously while it is open.)
- * NB: The ATI has NOT been tested yet!
- */
-
-/*
- * Modification history:
- * Sep 6, 1994 -- Lars Fredriksen(fredriks@mcs.com)
- *   improved probe based on input from Logitech.
- *
- * Oct 19, 1992 -- E. Stark (stark@cs.sunysb.edu)
- *   fixes to make it work with Microsoft InPort busmouse
- *
- * Jan, 1993 -- E. Stark (stark@cs.sunysb.edu)
- *   added patches for new "select" interface
- *
- * May 4, 1993 -- E. Stark (stark@cs.sunysb.edu)
- *   changed position of some spl()'s in mseread
- *
- * October 8, 1993 -- E. Stark (stark@cs.sunysb.edu)
- *   limit maximum negative x/y value to -127 to work around XFree problem
- *   that causes spurious button pushes.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/poll.h>
-#include <sys/selinfo.h>
-#include <sys/uio.h>
-#include <sys/mouse.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <isa/isavar.h>
-
-#include <dev/mse/msevar.h>
-
-static	int		mse_isa_probe(device_t dev);
-static	int		mse_isa_attach(device_t dev);
-
-static	device_method_t	mse_methods[] = {
-	DEVMETHOD(device_probe,		mse_isa_probe),
-	DEVMETHOD(device_attach,	mse_isa_attach),
-	DEVMETHOD(device_detach,	mse_detach),
-	{ 0, 0 }
-};
-
-static	driver_t	mse_driver = {
-	"mse",
-	mse_methods,
-	sizeof(mse_softc_t),
-};
-
-static struct isa_pnp_id mse_ids[] = {
-	{ 0x000fd041, "Bus mouse" },			/* PNP0F00 */
-	{ 0x020fd041, "InPort mouse" },			/* PNP0F02 */
-	{ 0x0d0fd041, "InPort mouse compatible" },	/* PNP0F0D */
-	{ 0x110fd041, "Bus mouse compatible" },		/* PNP0F11 */
-	{ 0x150fd041, "Logitech bus mouse" },		/* PNP0F15 */
-	{ 0x180fd041, "Logitech bus mouse compatible" },/* PNP0F18 */
-	{ 0 }
-};
-
-/*
- * Logitech bus mouse definitions
- */
-#define	MSE_SETUP	0x91	/* What does this mean? */
-				/* The definition for the control port */
-				/* is as follows: */
-
-				/* D7 	 =  Mode set flag (1 = active) 	*/
-				/* D6,D5 =  Mode selection (port A) 	*/
-				/* 	    00 = Mode 0 = Basic I/O 	*/
-				/* 	    01 = Mode 1 = Strobed I/O 	*/
-				/* 	    10 = Mode 2 = Bi-dir bus 	*/
-				/* D4	 =  Port A direction (1 = input)*/
-				/* D3	 =  Port C (upper 4 bits) 	*/
-				/*	    direction. (1 = input)	*/
-				/* D2	 =  Mode selection (port B & C) */
-				/*	    0 = Mode 0 = Basic I/O	*/
-				/*	    1 = Mode 1 = Strobed I/O	*/
-				/* D1	 =  Port B direction (1 = input)*/
-				/* D0	 =  Port C (lower 4 bits)	*/
-				/*	    direction. (1 = input)	*/
-
-				/* So 91 means Basic I/O on all 3 ports,*/
-				/* Port A is an input port, B is an 	*/
-				/* output port, C is split with upper	*/
-				/* 4 bits being an output port and lower*/
-				/* 4 bits an input port, and enable the */
-				/* sucker.				*/
-				/* Courtesy Intel 8255 databook. Lars   */
-#define	MSE_HOLD	0x80
-#define	MSE_RXLOW	0x00
-#define	MSE_RXHIGH	0x20
-#define	MSE_RYLOW	0x40
-#define	MSE_RYHIGH	0x60
-#define	MSE_DISINTR	0x10
-#define MSE_INTREN	0x00
-
-static	int		mse_probelogi(device_t dev, mse_softc_t *sc);
-static	void		mse_disablelogi(struct resource *port);
-static	void		mse_getlogi(struct resource *port, int *dx, int *dy,
-			    int *but);
-static	void		mse_enablelogi(struct resource *port);
-
-/*
- * ATI Inport mouse definitions
- */
-#define	MSE_INPORT_RESET	0x80
-#define	MSE_INPORT_STATUS	0x00
-#define	MSE_INPORT_DX		0x01
-#define	MSE_INPORT_DY		0x02
-#define	MSE_INPORT_MODE		0x07
-#define	MSE_INPORT_HOLD		0x20
-#define	MSE_INPORT_INTREN	0x09
-
-static	int		mse_probeati(device_t dev, mse_softc_t *sc);
-static	void		mse_enableati(struct resource *port);
-static	void		mse_disableati(struct resource *port);
-static	void		mse_getati(struct resource *port, int *dx, int *dy,
-			    int *but);
-
-static struct mse_types mse_types[] = {
-	{ MSE_ATIINPORT, 
-	  mse_probeati, mse_enableati, mse_disableati, mse_getati,
-	  { 2, MOUSE_IF_INPORT, MOUSE_MOUSE, MOUSE_MODEL_GENERIC, 0, },
-	  { MOUSE_PROTO_INPORT, -1, -1, 0, 0, MOUSE_MSC_PACKETSIZE, 
-	    { MOUSE_MSC_SYNCMASK, MOUSE_MSC_SYNC, }, }, },
-	{ MSE_LOGITECH, 
-	  mse_probelogi, mse_enablelogi, mse_disablelogi, mse_getlogi,
-	  { 2, MOUSE_IF_BUS, MOUSE_MOUSE, MOUSE_MODEL_GENERIC, 0, },
-	  { MOUSE_PROTO_BUS, -1, -1, 0, 0, MOUSE_MSC_PACKETSIZE, 
-	    { MOUSE_MSC_SYNCMASK, MOUSE_MSC_SYNC, }, }, },
-	{ 0, },
-};
-
-static	int
-mse_isa_probe(device_t dev)
-{
-	mse_softc_t *sc;
-	int error;
-	int rid;
-	int i;
-
-	/* check PnP IDs */
-	error = ISA_PNP_PROBE(device_get_parent(dev), dev, mse_ids);
-	if (error == ENXIO)
-		return error;
-
-	sc = device_get_softc(dev);
-	rid = 0;
-	sc->sc_port = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &rid,
-						  MSE_IOSIZE, RF_ACTIVE);
-	if (sc->sc_port == NULL)
-		return ENXIO;
-
-	/*
-	 * Check for each mouse type in the table.
-	 */
-	i = 0;
-	while (mse_types[i].m_type) {
-		if ((*mse_types[i].m_probe)(dev, sc)) {
-			sc->sc_mousetype = mse_types[i].m_type;
-			sc->sc_enablemouse = mse_types[i].m_enable;
-			sc->sc_disablemouse = mse_types[i].m_disable;
-			sc->sc_getmouse = mse_types[i].m_get;
-			sc->hw = mse_types[i].m_hw;
-			sc->mode = mse_types[i].m_mode;
-			bus_release_resource(dev, SYS_RES_IOPORT, rid,
-					     sc->sc_port);
-			device_set_desc(dev, "Bus/InPort Mouse");
-			return 0;
-		}
-		i++;
-	}
-	bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
-	return ENXIO;
-}
-
-static	int
-mse_isa_attach(device_t dev)
-{
-	mse_softc_t *sc;
-	int rid;
-
-	sc = device_get_softc(dev);
-
-	rid = 0;
-	sc->sc_port = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &rid,
-						  MSE_IOSIZE, RF_ACTIVE);
-	if (sc->sc_port == NULL)
-		return ENXIO;
-
-	return (mse_common_attach(dev));
-}
-
-/*
- * Routines for the Logitech mouse.
- */
-/*
- * Test for a Logitech bus mouse and return 1 if it is.
- * (until I know how to use the signature port properly, just disable
- *  interrupts and return 1)
- */
-static int
-mse_probelogi(device_t dev, mse_softc_t *sc)
-{
-
-	int sig;
-
-	bus_write_1(sc->sc_port, MSE_PORTD, MSE_SETUP);
-		/* set the signature port */
-	bus_write_1(sc->sc_port, MSE_PORTB, MSE_LOGI_SIG);
-
-	DELAY(30000); /* 30 ms delay */
-	sig = bus_read_1(sc->sc_port, MSE_PORTB) & 0xFF;
-	if (sig == MSE_LOGI_SIG) {
-		bus_write_1(sc->sc_port, MSE_PORTC, MSE_DISINTR);
-		return(1);
-	} else {
-		if (bootverbose)
-			device_printf(dev, "wrong signature %x\n", sig);
-		return(0);
-	}
-}
-
-/*
- * Initialize Logitech mouse and enable interrupts.
- */
-static void
-mse_enablelogi(struct resource *port)
-{
-	int dx, dy, but;
-
-	bus_write_1(port, MSE_PORTD, MSE_SETUP);
-	mse_getlogi(port, &dx, &dy, &but);
-}
-
-/*
- * Disable interrupts for Logitech mouse.
- */
-static void
-mse_disablelogi(struct resource *port)
-{
-
-	bus_write_1(port, MSE_PORTC, MSE_DISINTR);
-}
-
-/*
- * Get the current dx, dy and button up/down state.
- */
-static void
-mse_getlogi(struct resource *port, int *dx, int *dy, int *but)
-{
-	char x, y;
-
-	bus_write_1(port, MSE_PORTC, MSE_HOLD | MSE_RXLOW);
-	x = bus_read_1(port, MSE_PORTA);
-	*but = (x >> 5) & MOUSE_MSC_BUTTONS;
-	x &= 0xf;
-	bus_write_1(port, MSE_PORTC, MSE_HOLD | MSE_RXHIGH);
-	x |= (bus_read_1(port, MSE_PORTA) << 4);
-	bus_write_1(port, MSE_PORTC, MSE_HOLD | MSE_RYLOW);
-	y = (bus_read_1(port, MSE_PORTA) & 0xf);
-	bus_write_1(port, MSE_PORTC, MSE_HOLD | MSE_RYHIGH);
-	y |= (bus_read_1(port, MSE_PORTA) << 4);
-	*dx = x;
-	*dy = y;
-	bus_write_1(port, MSE_PORTC, MSE_INTREN);
-}
-
-/*
- * Routines for the ATI Inport bus mouse.
- */
-/*
- * Test for an ATI Inport bus mouse and return 1 if it is.
- * (do not enable interrupts)
- */
-static int
-mse_probeati(device_t dev, mse_softc_t *sc)
-{
-	int i;
-
-	for (i = 0; i < 2; i++)
-		if (bus_read_1(sc->sc_port, MSE_PORTC) == 0xde)
-			return (1);
-	return (0);
-}
-
-/*
- * Initialize ATI Inport mouse and enable interrupts.
- */
-static void
-mse_enableati(struct resource *port)
-{
-
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_RESET);
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_MODE);
-	bus_write_1(port, MSE_PORTB, MSE_INPORT_INTREN);
-}
-
-/*
- * Disable interrupts for ATI Inport mouse.
- */
-static void
-mse_disableati(struct resource *port)
-{
-
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_MODE);
-	bus_write_1(port, MSE_PORTB, 0);
-}
-
-/*
- * Get current dx, dy and up/down button state.
- */
-static void
-mse_getati(struct resource *port, int *dx, int *dy, int *but)
-{
-	char byte;
-
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_MODE);
-	bus_write_1(port, MSE_PORTB, MSE_INPORT_HOLD);
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_STATUS);
-	*but = ~bus_read_1(port, MSE_PORTB) & MOUSE_MSC_BUTTONS;
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_DX);
-	byte = bus_read_1(port, MSE_PORTB);
-	*dx = byte;
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_DY);
-	byte = bus_read_1(port, MSE_PORTB);
-	*dy = byte;
-	bus_write_1(port, MSE_PORTA, MSE_INPORT_MODE);
-	bus_write_1(port, MSE_PORTB, MSE_INPORT_INTREN);
-}
-
-DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
-ISA_PNP_INFO(mse_ids);
diff --git a/sys/dev/mse/msevar.h b/sys/dev/mse/msevar.h
deleted file mode 100644
index e0bdb7e693dec..0000000000000
--- a/sys/dev/mse/msevar.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2004 M. Warner Losh
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-/*-
- * Copyright 1992 by the University of Guelph
- *
- * Permission to use, copy and modify this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation.
- * University of Guelph makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-/* driver configuration flags (config) */
-#define MSE_CONFIG_ACCEL	0x00f0  /* acceleration factor */
-#define MSE_CONFIG_FLAGS	(MSE_CONFIG_ACCEL)
-
-/*
- * Software control structure for mouse. The sc_enablemouse(),
- * sc_disablemouse() and sc_getmouse() routines must be called locked.
- */
-typedef struct mse_softc {
-	int		sc_flags;
-	int		sc_mousetype;
-	struct selinfo	sc_selp;
-	struct resource	*sc_port;
-	struct resource	*sc_intr;
-	void		*sc_ih;
-	void		(*sc_enablemouse)(struct resource *port);
-	void		(*sc_disablemouse)(struct resource *port);
-	void		(*sc_getmouse)(struct resource *port, int *dx, int *dy,
-			    int *but);
-	int		sc_deltax;
-	int		sc_deltay;
-	int		sc_obuttons;
-	int		sc_buttons;
-	int		sc_bytesread;
-	u_char		sc_bytes[MOUSE_SYS_PACKETSIZE];
-	struct callout	sc_callout;
-	struct mtx	sc_lock;
-	int		sc_watchdog;
-	struct cdev *sc_dev;
-	struct cdev *sc_ndev;
-	mousehw_t	hw;
-	mousemode_t	mode;
-	mousestatus_t	status;
-} mse_softc_t;
-
-#define	MSE_LOCK(sc)		mtx_lock(&(sc)->sc_lock)
-#define	MSE_UNLOCK(sc)		mtx_unlock(&(sc)->sc_lock)
-#define	MSE_ASSERT_LOCKED(sc)	mtx_assert(&(sc)->sc_lock, MA_OWNED)
-
-/* Flags */
-#define	MSESC_OPEN	0x1
-#define	MSESC_WANT	0x2
-#define	MSESC_READING	0x4
-
-/* and Mouse Types */
-#define	MSE_NONE	0	/* don't move this! */
-
-/* isa bus mouse types */
-#define	MSE_LOGITECH	0x1
-#define	MSE_ATIINPORT	0x2
-
-#define	MSE_LOGI_SIG	0xA5
-
-/* XXX msereg.h? */
-#define	MSE_PORTA	0
-#define	MSE_PORTB	1
-#define	MSE_PORTC	2
-#define	MSE_PORTD	3
-#define MSE_IOSIZE	4
-
-/*
- * Table of mouse types.
- * Keep the Logitech last, since I haven't figured out how to probe it
- * properly yet. (Someday I'll have the documentation.)
- */
-struct mse_types {
-	int	m_type;		/* Type of bus mouse */
-	int	(*m_probe)(device_t dev, mse_softc_t *sc);
-				/* Probe routine to test for it */
-	void	(*m_enable)(struct resource *port);
-				/* Start routine */
-	void	(*m_disable)(struct resource *port);
-				/* Disable interrupts routine */
-	void	(*m_get)(struct resource *port, int *dx, int *dy, int *but);
-				/* and get mouse status */
-	mousehw_t   m_hw;	/* buttons iftype type model hwid */
-	mousemode_t m_mode;	/* proto rate res accel level size mask */
-};
-
-extern devclass_t	mse_devclass;
-int mse_common_attach(device_t);
-int mse_detach(device_t);
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3adeb338da7b3..6c09b8666a4bf 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -501,14 +501,6 @@ device		viadrm		# VIA
 options 	DRM_DEBUG	# Include debug printfs (slow)
 
 #
-# mse: Logitech and ATI InPort bus mouse ports
-
-device		mse
-hint.mse.0.at="isa"
-hint.mse.0.port="0x23c"
-hint.mse.0.irq="5"
-
-#
 # Network interfaces:
 #
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 906cc0b8b7d2b..0f3f6ee6552c1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -260,7 +260,6 @@ SUBDIR=	\
 	mrsas \
 	msdosfs \
 	msdosfs_iconv \
-	${_mse} \
 	msk \
 	${_mthca} \
 	mvs \
@@ -761,7 +760,6 @@ _cp=		cp
 _glxiic=	glxiic
 _glxsb=		glxsb
 #_ibcs2=		ibcs2
-_mse=		mse
 _ncr=		ncr
 _ncv=		ncv
 _nsp=		nsp
diff --git a/sys/modules/mse/Makefile b/sys/modules/mse/Makefile
deleted file mode 100644
index ea09b7cc9e61d..0000000000000
--- a/sys/modules/mse/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${SRCTOP}/sys/dev/mse
-
-KMOD=	mse
-SRCS=	mse.c mse_isa.c device_if.h bus_if.h isa_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index 882d59c9243a6..3bb65d5c6f530 100644
--- a/sys/sys/mouse.h
+++ b/sys/sys/mouse.h
@@ -141,8 +141,8 @@ typedef struct synapticshw {
 /* iftype */
 #define MOUSE_IF_UNKNOWN	(-1)
 #define MOUSE_IF_SERIAL		0
-#define MOUSE_IF_BUS		1
-#define MOUSE_IF_INPORT		2
+/* 1 was bus */
+/* 2 was inport */
 #define MOUSE_IF_PS2		3
 #define MOUSE_IF_SYSMOUSE	4
 #define MOUSE_IF_USB		5
@@ -200,8 +200,8 @@ typedef struct mousemode {
 #define MOUSE_PROTO_LOGI	2	/* Logitech, 3 bytes */
 #define MOUSE_PROTO_MM		3	/* MM series, 3 bytes */
 #define MOUSE_PROTO_LOGIMOUSEMAN 4	/* Logitech MouseMan 3/4 bytes */
-#define MOUSE_PROTO_BUS		5	/* MS/Logitech bus mouse */
-#define MOUSE_PROTO_INPORT	6	/* MS/ATI InPort mouse */
+/* 5 was bus mouse */
+/* 6 was inport mosue */
 #define MOUSE_PROTO_PS2		7	/* PS/2 mouse, 3 bytes */
 #define MOUSE_PROTO_HITTAB	8	/* Hitachi Tablet 3 bytes */
 #define MOUSE_PROTO_GLIDEPOINT	9	/* ALPS GlidePoint, 3/4 bytes */