10 files changed, 973 insertions, 2420 deletions

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 03898c9dba525..ecdc13ef5a174 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -168,6 +168,8 @@ dev/kbd/kbd.c			optional	vt
 dev/lnc/if_lnc_isa.c		optional	lnc isa
 dev/io/iodev.c			optional	io
 dev/mem/memutil.c		optional	mem
+dev/mse/mse.c			optional	mse
+dev/mse/mse_isa.c		optional	mse isa
 dev/ppc/ppc.c			optional	ppc
 dev/ppc/ppc_puc.c		optional	ppc puc pci
 dev/random/nehemiah.c		optional	random
@@ -290,7 +292,6 @@ i386/isa/elink.c		optional	ie
 i386/isa/if_el.c		optional	el
 i386/isa/isa.c			optional	isa
 i386/isa/isa_dma.c		optional	isa
-i386/isa/mse.c			optional	mse
 i386/isa/nmi.c			standard
 i386/isa/npx.c			optional	npx
 i386/isa/pcf.c			optional	pcf
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 6d14dd80fd119..037dd7665a7c2 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -111,6 +111,8 @@ dev/kbd/kbd.c			optional	pckbd
 dev/lnc/if_lnc_cbus.c		optional	lnc isa
 dev/io/iodev.c			optional	io
 dev/mem/memutil.c		optional	mem
+dev/mse/mse.c			optional	mse
+dev/mse/mse_cbus.c		optional	mse isa
 dev/ppc/ppc_puc.c		optional	ppc puc pci
 dev/sbni/if_sbni.c		optional	sbni
 dev/sbni/if_sbni_pci.c		optional	sbni pci
@@ -332,7 +334,6 @@ pc98/pc98/clock.c		standard
 pc98/pc98/fd.c			optional	fdc
 pc98/pc98/fdc_cbus.c		optional	fdc isa
 pc98/pc98/isa_dma.c		optional	isa
-pc98/pc98/mse.c			optional	mse
 pc98/pc98/nmi.c			standard
 pc98/pc98/olpt.c		optional	olpt
 pc98/pc98/pc98gdc.c		optional	gdc
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 31c85f89f1087..8a827d1eb30de 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -1,4 +1,34 @@
 /*
+ * 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,
+ *    without modification, immediately at the beginning of the file.
+ * 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
@@ -11,10 +41,6 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
  * the X386 port, courtesy of
@@ -57,7 +83,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/mouse.h>
 
-#include <machine/bus_pio.h>
 #include <machine/bus.h>
 #include <machine/clock.h>
 #include <machine/resource.h>
@@ -65,74 +90,9 @@ __FBSDID("$FreeBSD$");
 
 #include <isa/isavar.h>
 
-/* 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 spl'd().
- */
-typedef struct mse_softc {
-	int		sc_flags;
-	int		sc_mousetype;
-	struct selinfo	sc_selp;
-	struct resource	*sc_port;
-	struct resource	*sc_intr;
-	bus_space_tag_t	sc_iot;
-	bus_space_handle_t sc_ioh;
-	void		*sc_ih;
-	void		(*sc_enablemouse)(bus_space_tag_t t,
-			    bus_space_handle_t h);
-	void		(*sc_disablemouse)(bus_space_tag_t t,
-			    bus_space_handle_t h);
-	void		(*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h,
-			    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_handle sc_callout;
-	int		sc_watchdog;
-	struct cdev *sc_dev;
-	struct cdev *sc_ndev;
-	mousehw_t	hw;
-	mousemode_t	mode;
-	mousestatus_t	status;
-} mse_softc_t;
-
-static	devclass_t	mse_devclass;
+#include <dev/mse/msevar.h>
 
-static	int		mse_probe(device_t dev);
-static	int		mse_attach(device_t dev);
-static	int		mse_detach(device_t dev);
-
-static	device_method_t	mse_methods[] = {
-	DEVMETHOD(device_probe,		mse_probe),
-	DEVMETHOD(device_attach,	mse_attach),
-	DEVMETHOD(device_detach,	mse_detach),
-	{ 0, 0 }
-};
-
-static	driver_t	mse_driver = {
-	"mse",
-	mse_methods,
-	sizeof(mse_softc_t),
-};
-
-DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
-
-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 }
-};
+devclass_t	mse_devclass;
 
 static	d_open_t	mseopen;
 static	d_close_t	mseclose;
@@ -154,191 +114,27 @@ static struct cdevsw mse_cdevsw = {
 static	void		mseintr(void *);
 static	timeout_t	msetimeout;
 
-/* Flags */
-#define	MSESC_OPEN	0x1
-#define	MSESC_WANT	0x2
-
-/* and Mouse Types */
-#define	MSE_NONE	0	/* don't move this! */
-#define	MSE_LOGITECH	0x1
-#define	MSE_ATIINPORT	0x2
-#define	MSE_LOGI_SIG	0xA5
-
-#define	MSE_PORTA	0
-#define	MSE_PORTB	1
-#define	MSE_PORTC	2
-#define	MSE_PORTD	3
-#define MSE_IOSIZE	4
-
 #define	MSE_UNIT(dev)		(minor(dev) >> 1)
 #define	MSE_NBLOCKIO(dev)	(minor(dev) & 0x1)
 
-/*
- * 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(bus_space_tag_t t,
-			    bus_space_handle_t h);
-static	void		mse_getlogi(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-static	void		mse_enablelogi(bus_space_tag_t t,
-			    bus_space_handle_t h);
-
-/*
- * 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(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_disableati(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_getati(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-
 #define	MSEPRI	(PZERO + 3)
 
-/*
- * 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.)
- */
-static 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)(bus_space_tag_t t, bus_space_handle_t h);
-				/* Start routine */
-	void	(*m_disable)(bus_space_tag_t t, bus_space_handle_t h);
-				/* Disable interrupts routine */
-	void	(*m_get)(bus_space_tag_t t, bus_space_handle_t h, 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 */
-} 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_probe(dev)
-	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(dev, SYS_RES_IOPORT, &rid, 0, ~0,
-					 MSE_IOSIZE, RF_ACTIVE);
-	if (sc->sc_port == NULL)
-		return ENXIO;
-	sc->sc_iot = rman_get_bustag(sc->sc_port);
-	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
-
-	/*
-	 * 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_attach(dev)
-	device_t dev;
+int
+mse_common_attach(device_t dev)
 {
 	mse_softc_t *sc;
-	int flags;
-	int unit;
-	int rid;
+	int unit, flags, rid;
 
 	sc = device_get_softc(dev);
 	unit = device_get_unit(dev);
 
 	rid = 0;
-	sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
-					 MSE_IOSIZE, RF_ACTIVE);
-	if (sc->sc_port == NULL)
-		return ENXIO;
-	sc->sc_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
+	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);
 		return ENXIO;
 	}
-	sc->sc_iot = rman_get_bustag(sc->sc_port);
-	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
 
 	if (BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_intr,
 			   INTR_TYPE_TTY, mseintr, sc, &sc->sc_ih)) {
@@ -346,7 +142,6 @@ mse_attach(dev)
 		bus_release_resource(dev, SYS_RES_IRQ, rid, sc->sc_intr);
 		return ENXIO;
 	}
-
 	flags = device_get_flags(dev);
 	sc->mode.accelfactor = (flags & MSE_CONFIG_ACCEL) >> 4;
 	callout_handle_init(&sc->sc_callout);
@@ -355,29 +150,6 @@ mse_attach(dev)
 			      "mse%d", unit);
 	sc->sc_ndev = make_dev(&mse_cdevsw, (unit<<1)+1, 0, 0, 0600,
 			       "nmse%d", unit);
-
-	return 0;
-}
-
-static	int
-mse_detach(dev)
-	device_t dev;
-{
-	mse_softc_t *sc;
-	int rid;
-
-	sc = device_get_softc(dev);
-	if (sc->sc_flags & MSESC_OPEN)
-		return EBUSY;
-
-	rid = 0;
-	BUS_TEARDOWN_INTR(device_get_parent(dev), 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);
-
-	destroy_dev(sc->sc_dev);
-	destroy_dev(sc->sc_ndev);
-
 	return 0;
 }
 
@@ -754,164 +526,3 @@ mseintr(arg)
 		selwakeuppri(&sc->sc_selp, MSEPRI);
 	}
 }
-
-/*
- * 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(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-
-	int sig;
-
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTD, MSE_SETUP);
-		/* set the signature port */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB, MSE_LOGI_SIG);
-
-	DELAY(30000); /* 30 ms delay */
-	sig = bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB) & 0xFF;
-	if (sig == MSE_LOGI_SIG) {
-		bus_space_write_1(sc->sc_iot, sc->sc_ioh, 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(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-	int dx, dy, but;
-
-	bus_space_write_1(tag, handle, MSE_PORTD, MSE_SETUP);
-	mse_getlogi(tag, handle, &dx, &dy, &but);
-}
-
-/*
- * Disable interrupts for Logitech mouse.
- */
-static void
-mse_disablelogi(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_DISINTR);
-}
-
-/*
- * Get the current dx, dy and button up/down state.
- */
-static void
-mse_getlogi(tag, handle, dx, dy, but)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-	int *dx;
-	int *dy;
-	int *but;
-{
-	register char x, y;
-
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXLOW);
-	x = bus_space_read_1(tag, handle, MSE_PORTA);
-	*but = (x >> 5) & MOUSE_MSC_BUTTONS;
-	x &= 0xf;
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXHIGH);
-	x |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYLOW);
-	y = (bus_space_read_1(tag, handle, MSE_PORTA) & 0xf);
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYHIGH);
-	y |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
-	*dx = x;
-	*dy = y;
-	bus_space_write_1(tag, handle, 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(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-	int i;
-
-	for (i = 0; i < 2; i++)
-		if (bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTC) == 0xde)
-			return (1);
-	return (0);
-}
-
-/*
- * Initialize ATI Inport mouse and enable interrupts.
- */
-static void
-mse_enableati(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_RESET);
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
-}
-
-/*
- * Disable interrupts for ATI Inport mouse.
- */
-static void
-mse_disableati(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, 0);
-}
-
-/*
- * Get current dx, dy and up/down button state.
- */
-static void
-mse_getati(tag, handle, dx, dy, but)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-	int *dx;
-	int *dy;
-	int *but;
-{
-	register char byte;
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_HOLD);
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_STATUS);
-	*but = ~bus_space_read_1(tag, handle, MSE_PORTB) & MOUSE_MSC_BUTTONS;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DX);
-	byte = bus_space_read_1(tag, handle, MSE_PORTB);
-	*dx = byte;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DY);
-	byte = bus_space_read_1(tag, handle, MSE_PORTB);
-	*dy = byte;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
-}
diff --git a/sys/dev/mse/mse_cbus.c b/sys/dev/mse/mse_cbus.c
new file mode 100644
index 0000000000000..8fd99559e1d3f
--- /dev/null
+++ b/sys/dev/mse/mse_cbus.c
@@ -0,0 +1,344 @@
+/*
+ * 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,
+ *    without modification, immediately at the beginning of the file.
+ * 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/clock.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <isa/isavar.h>
+
+#include <dev/mse/msevar.h>
+
+static	int		mse_probe(device_t dev);
+static	int		mse_attach(device_t dev);
+static	int		mse_detach(device_t dev);
+
+static	device_method_t	mse_methods[] = {
+	DEVMETHOD(device_probe,		mse_probe),
+	DEVMETHOD(device_attach,	mse_attach),
+	DEVMETHOD(device_detach,	mse_detach),
+	{ 0, 0 }
+};
+
+static	driver_t	mse_driver = {
+	"mse",
+	mse_methods,
+	sizeof(mse_softc_t),
+};
+
+DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
+
+static struct isa_pnp_id mse_ids[] = {
+#if 0
+	{ 0x001fa3b8, "PC-98 bus mouse" },		/* NEC1F00 */
+#endif
+	{ 0 }
+};
+
+/*
+ * PC-9801 Bus mouse definitions
+ */
+
+#define	MODE	MSE_PORTD
+#define	HC	MSE_PORTD
+#define	INT	MSE_PORTD
+
+#define	XL	0x00
+#define	XH	0x20
+#define	YL	0x40
+#define	YH	0x60
+
+#define	INT_ENABLE	0x8
+#define	INT_DISABLE	0x9
+#define	HC_NO_CLEAR	0xe
+#define	HC_CLEAR	0xf
+
+static	bus_addr_t	mse_port[] = {0, 2, 4, 6};
+
+static	int		mse_probe98m(device_t dev, mse_softc_t *sc);
+static	void		mse_disable98m(bus_space_tag_t t, bus_space_handle_t h);
+static	void		mse_get98m(bus_space_tag_t t, bus_space_handle_t h,
+			    int *dx, int *dy, int *but);
+static	void		mse_enable98m(bus_space_tag_t t, bus_space_handle_t h);
+
+static struct mse_types mse_types[] = {
+	{ MSE_98BUSMOUSE,
+	  mse_probe98m, mse_enable98m, mse_disable98m, mse_get98m,
+	  { 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_probe(dev)
+	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 = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, mse_port,
+					  MSE_IOSIZE, RF_ACTIVE);
+	if (sc->sc_port == NULL)
+		return ENXIO;
+	if (isa_load_resourcev(sc->sc_port, mse_port, MSE_IOSIZE)) {
+		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
+		return ENXIO;
+	}
+	sc->sc_iot = rman_get_bustag(sc->sc_port);
+	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
+
+	/*
+	 * 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_attach(dev)
+	device_t dev;
+{
+	mse_softc_t *sc;
+	int rid;
+
+	sc = device_get_softc(dev);
+
+	rid = 0;
+	sc->sc_port = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, mse_port,
+					  MSE_IOSIZE, RF_ACTIVE);
+	if (sc->sc_port == NULL)
+		return ENXIO;
+	if (isa_load_resourcev(sc->sc_port, mse_port, MSE_IOSIZE)) {
+		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
+		return ENXIO;
+	}
+	sc->sc_iot = rman_get_bustag(sc->sc_port);
+	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
+
+	return (mse_common_attach(dev));
+}
+
+static	int
+mse_detach(dev)
+	device_t dev;
+{
+	mse_softc_t *sc;
+	int rid;
+
+	sc = device_get_softc(dev);
+	if (sc->sc_flags & MSESC_OPEN)
+		return EBUSY;
+
+	rid = 0;
+	BUS_TEARDOWN_INTR(device_get_parent(dev), 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);
+
+	destroy_dev(sc->sc_dev);
+	destroy_dev(sc->sc_ndev);
+
+	return 0;
+}
+
+/*
+ * Routines for the PC98 bus mouse.
+ */
+
+/*
+ * Test for a PC98 bus mouse and return 1 if it is.
+ * (do not enable interrupts)
+ */
+static int
+mse_probe98m(dev, sc)
+	device_t dev;
+	mse_softc_t *sc;
+{
+	/* mode set */
+	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MODE, 0x93);
+
+	/* initialize */
+	/* INT disable */
+	bus_space_write_1(sc->sc_iot, sc->sc_ioh, INT, INT_DISABLE);
+	/* HC = 0 */
+	bus_space_write_1(sc->sc_iot, sc->sc_ioh, HC, HC_NO_CLEAR);
+	/* HC = 1 */
+	bus_space_write_1(sc->sc_iot, sc->sc_ioh, HC, HC_CLEAR);
+
+	return (1);
+}
+
+/*
+ * Initialize PC98 bus mouse and enable interrupts.
+ */
+static void
+mse_enable98m(tag, handle)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+{
+	bus_space_write_1(tag, handle, INT, INT_ENABLE);    /* INT enable */
+	bus_space_write_1(tag, handle, HC, HC_NO_CLEAR);    /* HC = 0 */
+	bus_space_write_1(tag, handle, HC, HC_CLEAR);       /* HC = 1 */
+}
+ 
+/*
+ * Disable interrupts for PC98 Bus mouse.
+ */
+static void
+mse_disable98m(tag, handle)
+        bus_space_tag_t tag;
+        bus_space_handle_t handle;
+{
+	bus_space_write_1(tag, handle, INT, INT_DISABLE);   /* INT disable */
+	bus_space_write_1(tag, handle, HC, HC_NO_CLEAR);    /* HC = 0 */
+	bus_space_write_1(tag, handle, HC, HC_CLEAR);       /* HC = 1 */
+}
+
+/*
+ * Get current dx, dy and up/down button state.
+ */
+static void
+mse_get98m(tag, handle, dx, dy, but)
+        bus_space_tag_t tag;
+        bus_space_handle_t handle;
+        int *dx;
+        int *dy;
+        int *but;
+{
+	register char x, y;
+
+	bus_space_write_1(tag, handle, INT, INT_DISABLE);   /* INT disable */
+
+	bus_space_write_1(tag, handle, HC, HC_CLEAR);       /* HC = 1 */
+
+	/* X low */
+	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | XL);
+	x = bus_space_read_1(tag, handle, MSE_PORTA) & 0x0f;
+	/* X high */
+	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | XH);
+	x |= ((bus_space_read_1(tag, handle, MSE_PORTA)  & 0x0f) << 4);
+
+	/* Y low */
+	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | YL);
+	y = (bus_space_read_1(tag, handle, MSE_PORTA) & 0x0f);
+	/* Y high */
+	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | YH);
+	y |= ((bus_space_read_1(tag, handle, MSE_PORTA) & 0x0f) << 4);
+
+	*but = (bus_space_read_1(tag, handle, MSE_PORTA) >> 5) & 7;
+
+	*dx = x;
+	*dy = y;
+
+	bus_space_write_1(tag, handle, HC, HC_NO_CLEAR);    /* HC = 0 */
+
+	bus_space_write_1(tag, handle, INT, INT_ENABLE);    /* INT enable */
+}
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
new file mode 100644
index 0000000000000..d06bfa80999c4
--- /dev/null
+++ b/sys/dev/mse/mse_isa.c
@@ -0,0 +1,447 @@
+/*
+ * 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,
+ *    without modification, immediately at the beginning of the file.
+ * 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/clock.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <isa/isavar.h>
+
+#include <dev/mse/msevar.h>
+
+static	int		mse_probe(device_t dev);
+static	int		mse_attach(device_t dev);
+static	int		mse_detach(device_t dev);
+
+static	device_method_t	mse_methods[] = {
+	DEVMETHOD(device_probe,		mse_probe),
+	DEVMETHOD(device_attach,	mse_attach),
+	DEVMETHOD(device_detach,	mse_detach),
+	{ 0, 0 }
+};
+
+static	driver_t	mse_driver = {
+	"mse",
+	mse_methods,
+	sizeof(mse_softc_t),
+};
+
+DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
+
+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(bus_space_tag_t t,
+			    bus_space_handle_t h);
+static	void		mse_getlogi(bus_space_tag_t t, bus_space_handle_t h,
+			    int *dx, int *dy, int *but);
+static	void		mse_enablelogi(bus_space_tag_t t,
+			    bus_space_handle_t h);
+
+/*
+ * 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(bus_space_tag_t t, bus_space_handle_t h);
+static	void		mse_disableati(bus_space_tag_t t, bus_space_handle_t h);
+static	void		mse_getati(bus_space_tag_t t, bus_space_handle_t h,
+			    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_probe(dev)
+	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(dev, SYS_RES_IOPORT, &rid, 0, ~0,
+					 MSE_IOSIZE, RF_ACTIVE);
+	if (sc->sc_port == NULL)
+		return ENXIO;
+	sc->sc_iot = rman_get_bustag(sc->sc_port);
+	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
+
+	/*
+	 * 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_attach(dev)
+	device_t dev;
+{
+	mse_softc_t *sc;
+	int rid;
+
+	sc = device_get_softc(dev);
+
+	rid = 0;
+	sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
+					 MSE_IOSIZE, RF_ACTIVE);
+	if (sc->sc_port == NULL)
+		return ENXIO;
+	sc->sc_iot = rman_get_bustag(sc->sc_port);
+	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
+
+	return (mse_common_attach(dev));
+}
+
+static	int
+mse_detach(dev)
+	device_t dev;
+{
+	mse_softc_t *sc;
+	int rid;
+
+	sc = device_get_softc(dev);
+	if (sc->sc_flags & MSESC_OPEN)
+		return EBUSY;
+
+	rid = 0;
+	BUS_TEARDOWN_INTR(device_get_parent(dev), 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);
+
+	destroy_dev(sc->sc_dev);
+	destroy_dev(sc->sc_ndev);
+
+	return 0;
+}
+
+/*
+ * 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(dev, sc)
+	device_t dev;
+	mse_softc_t *sc;
+{
+
+	int sig;
+
+	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTD, MSE_SETUP);
+		/* set the signature port */
+	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB, MSE_LOGI_SIG);
+
+	DELAY(30000); /* 30 ms delay */
+	sig = bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB) & 0xFF;
+	if (sig == MSE_LOGI_SIG) {
+		bus_space_write_1(sc->sc_iot, sc->sc_ioh, 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(tag, handle)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+{
+	int dx, dy, but;
+
+	bus_space_write_1(tag, handle, MSE_PORTD, MSE_SETUP);
+	mse_getlogi(tag, handle, &dx, &dy, &but);
+}
+
+/*
+ * Disable interrupts for Logitech mouse.
+ */
+static void
+mse_disablelogi(tag, handle)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+{
+
+	bus_space_write_1(tag, handle, MSE_PORTC, MSE_DISINTR);
+}
+
+/*
+ * Get the current dx, dy and button up/down state.
+ */
+static void
+mse_getlogi(tag, handle, dx, dy, but)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+	int *dx;
+	int *dy;
+	int *but;
+{
+	register char x, y;
+
+	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXLOW);
+	x = bus_space_read_1(tag, handle, MSE_PORTA);
+	*but = (x >> 5) & MOUSE_MSC_BUTTONS;
+	x &= 0xf;
+	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXHIGH);
+	x |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
+	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYLOW);
+	y = (bus_space_read_1(tag, handle, MSE_PORTA) & 0xf);
+	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYHIGH);
+	y |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
+	*dx = x;
+	*dy = y;
+	bus_space_write_1(tag, handle, 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(dev, sc)
+	device_t dev;
+	mse_softc_t *sc;
+{
+	int i;
+
+	for (i = 0; i < 2; i++)
+		if (bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTC) == 0xde)
+			return (1);
+	return (0);
+}
+
+/*
+ * Initialize ATI Inport mouse and enable interrupts.
+ */
+static void
+mse_enableati(tag, handle)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+{
+
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_RESET);
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
+	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
+}
+
+/*
+ * Disable interrupts for ATI Inport mouse.
+ */
+static void
+mse_disableati(tag, handle)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+{
+
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
+	bus_space_write_1(tag, handle, MSE_PORTB, 0);
+}
+
+/*
+ * Get current dx, dy and up/down button state.
+ */
+static void
+mse_getati(tag, handle, dx, dy, but)
+	bus_space_tag_t tag;
+	bus_space_handle_t handle;
+	int *dx;
+	int *dy;
+	int *but;
+{
+	register char byte;
+
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
+	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_HOLD);
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_STATUS);
+	*but = ~bus_space_read_1(tag, handle, MSE_PORTB) & MOUSE_MSC_BUTTONS;
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DX);
+	byte = bus_space_read_1(tag, handle, MSE_PORTB);
+	*dx = byte;
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DY);
+	byte = bus_space_read_1(tag, handle, MSE_PORTB);
+	*dy = byte;
+	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
+	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
+}
diff --git a/sys/dev/mse/msevar.h b/sys/dev/mse/msevar.h
new file mode 100644
index 0000000000000..edbb482a77a38
--- /dev/null
+++ b/sys/dev/mse/msevar.h
@@ -0,0 +1,125 @@
+/*
+ * 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,
+ *    without modification, immediately at the beginning of the file.
+ * 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 spl'd().
+ */
+typedef struct mse_softc {
+	int		sc_flags;
+	int		sc_mousetype;
+	struct selinfo	sc_selp;
+	struct resource	*sc_port;
+	struct resource	*sc_intr;
+	bus_space_tag_t	sc_iot;
+	bus_space_handle_t sc_ioh;
+	void		*sc_ih;
+	void		(*sc_enablemouse)(bus_space_tag_t t,
+			    bus_space_handle_t h);
+	void		(*sc_disablemouse)(bus_space_tag_t t,
+			    bus_space_handle_t h);
+	void		(*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h,
+			    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_handle sc_callout;
+	int		sc_watchdog;
+	struct cdev *sc_dev;
+	struct cdev *sc_ndev;
+	mousehw_t	hw;
+	mousemode_t	mode;
+	mousestatus_t	status;
+} mse_softc_t;
+
+/* Flags */
+#define	MSESC_OPEN	0x1
+#define	MSESC_WANT	0x2
+
+/* and Mouse Types */
+#define	MSE_NONE	0	/* don't move this! */
+#ifdef PC98
+#define	MSE_98BUSMOUSE	0x1
+#else
+#define	MSE_LOGITECH	0x1
+#define	MSE_ATIINPORT	0x2
+#define	MSE_LOGI_SIG	0xA5
+#endif
+
+/* 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)(bus_space_tag_t t, bus_space_handle_t h);
+				/* Start routine */
+	void	(*m_disable)(bus_space_tag_t t, bus_space_handle_t h);
+				/* Disable interrupts routine */
+	void	(*m_get)(bus_space_tag_t t, bus_space_handle_t h, 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);
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
deleted file mode 100644
index 31c85f89f1087..0000000000000
--- a/sys/i386/isa/mse.c
+++ /dev/null
@@ -1,917 +0,0 @@
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * 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_pio.h>
-#include <machine/bus.h>
-#include <machine/clock.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <isa/isavar.h>
-
-/* 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 spl'd().
- */
-typedef struct mse_softc {
-	int		sc_flags;
-	int		sc_mousetype;
-	struct selinfo	sc_selp;
-	struct resource	*sc_port;
-	struct resource	*sc_intr;
-	bus_space_tag_t	sc_iot;
-	bus_space_handle_t sc_ioh;
-	void		*sc_ih;
-	void		(*sc_enablemouse)(bus_space_tag_t t,
-			    bus_space_handle_t h);
-	void		(*sc_disablemouse)(bus_space_tag_t t,
-			    bus_space_handle_t h);
-	void		(*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h,
-			    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_handle sc_callout;
-	int		sc_watchdog;
-	struct cdev *sc_dev;
-	struct cdev *sc_ndev;
-	mousehw_t	hw;
-	mousemode_t	mode;
-	mousestatus_t	status;
-} mse_softc_t;
-
-static	devclass_t	mse_devclass;
-
-static	int		mse_probe(device_t dev);
-static	int		mse_attach(device_t dev);
-static	int		mse_detach(device_t dev);
-
-static	device_method_t	mse_methods[] = {
-	DEVMETHOD(device_probe,		mse_probe),
-	DEVMETHOD(device_attach,	mse_attach),
-	DEVMETHOD(device_detach,	mse_detach),
-	{ 0, 0 }
-};
-
-static	driver_t	mse_driver = {
-	"mse",
-	mse_methods,
-	sizeof(mse_softc_t),
-};
-
-DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
-
-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 }
-};
-
-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_flags =	D_NEEDGIANT,
-	.d_open =	mseopen,
-	.d_close =	mseclose,
-	.d_read =	mseread,
-	.d_ioctl =	mseioctl,
-	.d_poll =	msepoll,
-	.d_name =	"mse",
-};
-
-static	void		mseintr(void *);
-static	timeout_t	msetimeout;
-
-/* Flags */
-#define	MSESC_OPEN	0x1
-#define	MSESC_WANT	0x2
-
-/* and Mouse Types */
-#define	MSE_NONE	0	/* don't move this! */
-#define	MSE_LOGITECH	0x1
-#define	MSE_ATIINPORT	0x2
-#define	MSE_LOGI_SIG	0xA5
-
-#define	MSE_PORTA	0
-#define	MSE_PORTB	1
-#define	MSE_PORTC	2
-#define	MSE_PORTD	3
-#define MSE_IOSIZE	4
-
-#define	MSE_UNIT(dev)		(minor(dev) >> 1)
-#define	MSE_NBLOCKIO(dev)	(minor(dev) & 0x1)
-
-/*
- * 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(bus_space_tag_t t,
-			    bus_space_handle_t h);
-static	void		mse_getlogi(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-static	void		mse_enablelogi(bus_space_tag_t t,
-			    bus_space_handle_t h);
-
-/*
- * 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(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_disableati(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_getati(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-
-#define	MSEPRI	(PZERO + 3)
-
-/*
- * 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.)
- */
-static 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)(bus_space_tag_t t, bus_space_handle_t h);
-				/* Start routine */
-	void	(*m_disable)(bus_space_tag_t t, bus_space_handle_t h);
-				/* Disable interrupts routine */
-	void	(*m_get)(bus_space_tag_t t, bus_space_handle_t h, 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 */
-} 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_probe(dev)
-	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(dev, SYS_RES_IOPORT, &rid, 0, ~0,
-					 MSE_IOSIZE, RF_ACTIVE);
-	if (sc->sc_port == NULL)
-		return ENXIO;
-	sc->sc_iot = rman_get_bustag(sc->sc_port);
-	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
-
-	/*
-	 * 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_attach(dev)
-	device_t dev;
-{
-	mse_softc_t *sc;
-	int flags;
-	int unit;
-	int rid;
-
-	sc = device_get_softc(dev);
-	unit = device_get_unit(dev);
-
-	rid = 0;
-	sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
-					 MSE_IOSIZE, RF_ACTIVE);
-	if (sc->sc_port == NULL)
-		return ENXIO;
-	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);
-		return ENXIO;
-	}
-	sc->sc_iot = rman_get_bustag(sc->sc_port);
-	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
-
-	if (BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_intr,
-			   INTR_TYPE_TTY, 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);
-		return ENXIO;
-	}
-
-	flags = device_get_flags(dev);
-	sc->mode.accelfactor = (flags & MSE_CONFIG_ACCEL) >> 4;
-	callout_handle_init(&sc->sc_callout);
-
-	sc->sc_dev = make_dev(&mse_cdevsw, unit << 1, 0, 0, 0600,
-			      "mse%d", unit);
-	sc->sc_ndev = make_dev(&mse_cdevsw, (unit<<1)+1, 0, 0, 0600,
-			       "nmse%d", unit);
-
-	return 0;
-}
-
-static	int
-mse_detach(dev)
-	device_t dev;
-{
-	mse_softc_t *sc;
-	int rid;
-
-	sc = device_get_softc(dev);
-	if (sc->sc_flags & MSESC_OPEN)
-		return EBUSY;
-
-	rid = 0;
-	BUS_TEARDOWN_INTR(device_get_parent(dev), 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);
-
-	destroy_dev(sc->sc_dev);
-	destroy_dev(sc->sc_ndev);
-
-	return 0;
-}
-
-/*
- * Exclusive open the mouse, initialize it and enable interrupts.
- */
-static	int
-mseopen(dev, flags, fmt, td)
-	struct cdev *dev;
-	int flags;
-	int fmt;
-	struct thread *td;
-{
-	mse_softc_t *sc;
-	int s;
-
-	sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	if (sc == NULL)
-		return (ENXIO);
-	if (sc->sc_mousetype == MSE_NONE)
-		return (ENXIO);
-	if (sc->sc_flags & MSESC_OPEN)
-		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;
-	sc->sc_callout = timeout(msetimeout, dev, hz*2);
-	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.
-	 */
-	s = spltty();
-	(*sc->sc_enablemouse)(sc->sc_iot, sc->sc_ioh);
-	splx(s);
-	return (0);
-}
-
-/*
- * mseclose: just turn off mouse innterrupts.
- */
-static	int
-mseclose(dev, flags, fmt, td)
-	struct cdev *dev;
-	int flags;
-	int fmt;
-	struct thread *td;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	int s;
-
-	untimeout(msetimeout, dev, sc->sc_callout);
-	callout_handle_init(&sc->sc_callout);
-	s = spltty();
-	(*sc->sc_disablemouse)(sc->sc_iot, sc->sc_ioh);
-	sc->sc_flags &= ~MSESC_OPEN;
-	splx(s);
-	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(dev, uio, ioflag)
-	struct cdev *dev;
-	struct uio *uio;
-	int ioflag;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	int xfer, s, error;
-
-	/*
-	 * If there are no protocol bytes to be read, set up a new protocol
-	 * packet.
-	 */
-	s = spltty(); /* XXX Should be its own spl, but where is imlXX() */
-	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)) {
-				splx(s);
-				return (0);
-			}
-			sc->sc_flags |= MSESC_WANT;
-			error = tsleep(sc, MSEPRI | PCATCH,
-				"mseread", 0);
-			if (error) {
-				splx(s);
-				return (error);
-			}
-		}
-
-		/*
-		 * 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;
-	}
-	splx(s);
-	xfer = min(uio->uio_resid, sc->mode.packetsize - sc->sc_bytesread);
-	error = uiomove(&sc->sc_bytes[sc->sc_bytesread], xfer, uio);
-	if (error)
-		return (error);
-	sc->sc_bytesread += xfer;
-	return(0);
-}
-
-/*
- * mseioctl: process ioctl commands.
- */
-static int
-mseioctl(dev, cmd, addr, flag, td)
-	struct cdev *dev;
-	u_long cmd;
-	caddr_t addr;
-	int flag;
-	struct thread *td;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	mousestatus_t status;
-	int err = 0;
-	int s;
-
-	switch (cmd) {
-
-	case MOUSE_GETHWINFO:
-		s = spltty();
-		*(mousehw_t *)addr = sc->hw;
-		if (sc->mode.level == 0)
-			((mousehw_t *)addr)->model = MOUSE_MODEL_GENERIC;
-		splx(s);
-		break;
-
-	case MOUSE_GETMODE:
-		s = spltty();
-		*(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;
-		}
-		splx(s);
-		break;
-
-	case MOUSE_SETMODE:
-		switch (((mousemode_t *)addr)->level) {
-		case 0:
-		case 1:
-			break;
-		default:
-			return (EINVAL);
-		}
-		if (((mousemode_t *)addr)->accelfactor < -1)
-			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;
-		}
-		break;
-
-	case MOUSE_GETLEVEL:
-		*(int *)addr = sc->mode.level;
-		break;
-
-	case MOUSE_SETLEVEL:
-		switch (*(int *)addr) {
-		case 0:
-			sc->mode.level = *(int *)addr;
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_MSC_PACKETSIZE;
-			break;
-		case 1:
-			sc->mode.level = *(int *)addr;
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_SYS_PACKETSIZE;
-			break;
-		default:
-			return (EINVAL);
-		}
-		break;
-
-	case MOUSE_GETSTATUS:
-		s = spltty();
-		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;
-		splx(s);
-		*(mousestatus_t *)addr = status;
-		break;
-
-	case MOUSE_READSTATE:
-	case MOUSE_READDATA:
-		return (ENODEV);
-
-#if (defined(MOUSE_GETVARS))
-	case MOUSE_GETVARS:
-	case MOUSE_SETVARS:
-		return (ENODEV);
-#endif
-
-	default:
-		return (ENOTTY);
-	}
-	return (err);
-}
-
-/*
- * msepoll: check for mouse input to be processed.
- */
-static	int
-msepoll(dev, events, td)
-	struct cdev *dev;
-	int events;
-	struct thread *td;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	int s;
-	int revents = 0;
-
-	s = spltty();
-	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 {
-			/*
-			 * Since this is an exclusive open device, any previous
-			 * proc pointer is trash now, so we can just assign it.
-			 */
-			selrecord(td, &sc->sc_selp);
-		}
-	}
-	splx(s);
-	return (revents);
-}
-
-/*
- * msetimeout: watchdog timer routine.
- */
-static void
-msetimeout(arg)
-	void *arg;
-{
-	struct cdev *dev;
-	mse_softc_t *sc;
-
-	dev = (struct cdev *)arg;
-	sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	if (sc->sc_watchdog) {
-		if (bootverbose)
-			printf("mse%d: lost interrupt?\n", MSE_UNIT(dev));
-		mseintr(sc);
-	}
-	sc->sc_watchdog = TRUE;
-	sc->sc_callout = timeout(msetimeout, dev, hz);
-}
-
-/*
- * mseintr: update mouse status. sc_deltax and sc_deltay are accumulative.
- */
-static void
-mseintr(arg)
-	void *arg;
-{
-	/*
-	 * 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
-	};
-	mse_softc_t *sc = arg;
-	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_iot, sc->sc_ioh, &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);
-	}
-}
-
-/*
- * 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(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-
-	int sig;
-
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTD, MSE_SETUP);
-		/* set the signature port */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB, MSE_LOGI_SIG);
-
-	DELAY(30000); /* 30 ms delay */
-	sig = bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB) & 0xFF;
-	if (sig == MSE_LOGI_SIG) {
-		bus_space_write_1(sc->sc_iot, sc->sc_ioh, 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(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-	int dx, dy, but;
-
-	bus_space_write_1(tag, handle, MSE_PORTD, MSE_SETUP);
-	mse_getlogi(tag, handle, &dx, &dy, &but);
-}
-
-/*
- * Disable interrupts for Logitech mouse.
- */
-static void
-mse_disablelogi(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_DISINTR);
-}
-
-/*
- * Get the current dx, dy and button up/down state.
- */
-static void
-mse_getlogi(tag, handle, dx, dy, but)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-	int *dx;
-	int *dy;
-	int *but;
-{
-	register char x, y;
-
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXLOW);
-	x = bus_space_read_1(tag, handle, MSE_PORTA);
-	*but = (x >> 5) & MOUSE_MSC_BUTTONS;
-	x &= 0xf;
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXHIGH);
-	x |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYLOW);
-	y = (bus_space_read_1(tag, handle, MSE_PORTA) & 0xf);
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYHIGH);
-	y |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
-	*dx = x;
-	*dy = y;
-	bus_space_write_1(tag, handle, 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(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-	int i;
-
-	for (i = 0; i < 2; i++)
-		if (bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTC) == 0xde)
-			return (1);
-	return (0);
-}
-
-/*
- * Initialize ATI Inport mouse and enable interrupts.
- */
-static void
-mse_enableati(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_RESET);
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
-}
-
-/*
- * Disable interrupts for ATI Inport mouse.
- */
-static void
-mse_disableati(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, 0);
-}
-
-/*
- * Get current dx, dy and up/down button state.
- */
-static void
-mse_getati(tag, handle, dx, dy, but)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-	int *dx;
-	int *dy;
-	int *but;
-{
-	register char byte;
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_HOLD);
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_STATUS);
-	*but = ~bus_space_read_1(tag, handle, MSE_PORTB) & MOUSE_MSC_BUTTONS;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DX);
-	byte = bus_space_read_1(tag, handle, MSE_PORTB);
-	*dx = byte;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DY);
-	byte = bus_space_read_1(tag, handle, MSE_PORTB);
-	*dy = byte;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
-}
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 0e7a48264f988..6846b6e8b79d8 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -141,6 +141,7 @@ SUBDIR=	${_3dfx} \
 	mlx \
 	${_mly} \
 	mpt \
+	${_mse} \
 	msdosfs \
 	msdosfs_iconv \
 	my \
@@ -315,6 +316,7 @@ _io=		io
 _linprocfs=	linprocfs
 _linux=		linux
 _lnc=		lnc
+_mse=		mse
 _ncp=		ncp
 _ncv=		ncv
 _ndis=		ndis
diff --git a/sys/modules/mse/Makefile b/sys/modules/mse/Makefile
new file mode 100644
index 0000000000000..4cc68c1f9c6d9
--- /dev/null
+++ b/sys/modules/mse/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/mse
+
+KMOD=	mse
+SRCS=	mse.c device_if.h bus_if.h isa_if.h
+
+.if (${MACHINE} == "pc98")
+SRCS+= mse_cbus.c
+.else
+SRCS+= mse_isa.c
+.endif
+
+.include <bsd.kmod.mk>
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
deleted file mode 100644
index 9b8b83bcc12e5..0000000000000
--- a/sys/pc98/pc98/mse.c
+++ /dev/null
@@ -1,1075 +0,0 @@
-/*
- * 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.
- *
- * $FreeBSD$
- */
-/*
- * 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/clock.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <isa/isavar.h>
-
-/* 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 spl'd().
- */
-typedef struct mse_softc {
-	int		sc_flags;
-	int		sc_mousetype;
-	struct selinfo	sc_selp;
-	struct resource	*sc_port;
-	struct resource	*sc_intr;
-	bus_space_tag_t	sc_iot;
-	bus_space_handle_t sc_ioh;
-	void		*sc_ih;
-	void		(*sc_enablemouse)(bus_space_tag_t t,
-			    bus_space_handle_t h);
-	void		(*sc_disablemouse)(bus_space_tag_t t,
-			    bus_space_handle_t h);
-	void		(*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h,
-			    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_handle sc_callout;
-	int		sc_watchdog;
-	struct cdev *sc_dev;
-	struct cdev *sc_ndev;
-	mousehw_t	hw;
-	mousemode_t	mode;
-	mousestatus_t	status;
-} mse_softc_t;
-
-static	devclass_t	mse_devclass;
-
-static	int		mse_probe(device_t dev);
-static	int		mse_attach(device_t dev);
-static	int		mse_detach(device_t dev);
-
-static	device_method_t	mse_methods[] = {
-	DEVMETHOD(device_probe,		mse_probe),
-	DEVMETHOD(device_attach,	mse_attach),
-	DEVMETHOD(device_detach,	mse_detach),
-	{ 0, 0 }
-};
-
-static	driver_t	mse_driver = {
-	"mse",
-	mse_methods,
-	sizeof(mse_softc_t),
-};
-
-DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0);
-
-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 }
-};
-
-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_flags =	D_NEEDGIANT,
-	.d_open =	mseopen,
-	.d_close =	mseclose,
-	.d_read =	mseread,
-	.d_ioctl =	mseioctl,
-	.d_poll =	msepoll,
-	.d_name =	"mse",
-};
-
-static	void		mseintr(void *);
-static	timeout_t	msetimeout;
-
-/* Flags */
-#define	MSESC_OPEN	0x1
-#define	MSESC_WANT	0x2
-
-/* and Mouse Types */
-#define	MSE_NONE	0	/* don't move this! */
-#ifdef PC98
-#define	MSE_98BUSMOUSE	0x1
-#else
-#define	MSE_LOGITECH	0x1
-#define	MSE_ATIINPORT	0x2
-#define	MSE_LOGI_SIG	0xA5
-#endif
-
-#define	MSE_PORTA	0
-#define	MSE_PORTB	1
-#define	MSE_PORTC	2
-#define	MSE_PORTD	3
-#define MSE_IOSIZE	4
-
-#define	MSE_UNIT(dev)		(minor(dev) >> 1)
-#define	MSE_NBLOCKIO(dev)	(minor(dev) & 0x1)
-
-#ifdef PC98
-/*
- * PC-9801 Bus mouse definitions
- */
-
-#define	MODE	MSE_PORTD
-#define	HC	MSE_PORTD
-#define	INT	MSE_PORTD
-
-#define	XL	0x00
-#define	XH	0x20
-#define	YL	0x40
-#define	YH	0x60
-
-#define	INT_ENABLE	0x8
-#define	INT_DISABLE	0x9
-#define	HC_NO_CLEAR	0xe
-#define	HC_CLEAR	0xf
-
-static	bus_addr_t	mse_port[] = {0, 2, 4, 6};
-
-static	int		mse_probe98m(device_t dev, mse_softc_t *sc);
-static	void		mse_disable98m(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_get98m(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-static	void		mse_enable98m(bus_space_tag_t t, bus_space_handle_t h);
-#else
-/*
- * 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(bus_space_tag_t t,
-			    bus_space_handle_t h);
-static	void		mse_getlogi(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-static	void		mse_enablelogi(bus_space_tag_t t,
-			    bus_space_handle_t h);
-
-/*
- * 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(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_disableati(bus_space_tag_t t, bus_space_handle_t h);
-static	void		mse_getati(bus_space_tag_t t, bus_space_handle_t h,
-			    int *dx, int *dy, int *but);
-#endif
-
-#define	MSEPRI	(PZERO + 3)
-
-/*
- * 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.)
- */
-static 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)(bus_space_tag_t t, bus_space_handle_t h);
-				/* Start routine */
-	void	(*m_disable)(bus_space_tag_t t, bus_space_handle_t h);
-				/* Disable interrupts routine */
-	void	(*m_get)(bus_space_tag_t t, bus_space_handle_t h, 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 */
-} mse_types[] = {
-#ifdef PC98
-	{ MSE_98BUSMOUSE,
-	  mse_probe98m, mse_enable98m, mse_disable98m, mse_get98m,
-	  { 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, }, }, },
-#else
-	{ 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, }, }, },
-#endif
-	{ 0, },
-};
-
-static	int
-mse_probe(dev)
-	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;
-#ifdef PC98
-	sc->sc_port = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, mse_port,
-					  MSE_IOSIZE, RF_ACTIVE);
-#else
-	sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
-					 MSE_IOSIZE, RF_ACTIVE);
-#endif
-	if (sc->sc_port == NULL)
-		return ENXIO;
-#ifdef PC98
-	if (isa_load_resourcev(sc->sc_port, mse_port, MSE_IOSIZE)) {
-		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
-		return ENXIO;
-	}
-#endif
-	sc->sc_iot = rman_get_bustag(sc->sc_port);
-	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
-
-	/*
-	 * 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_attach(dev)
-	device_t dev;
-{
-	mse_softc_t *sc;
-	int flags;
-	int unit;
-	int rid;
-
-	sc = device_get_softc(dev);
-	unit = device_get_unit(dev);
-
-	rid = 0;
-#ifdef PC98
-	sc->sc_port = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, mse_port,
-					  MSE_IOSIZE, RF_ACTIVE);
-#else
-	sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
-					 MSE_IOSIZE, RF_ACTIVE);
-#endif
-	if (sc->sc_port == NULL)
-		return ENXIO;
-#ifdef PC98
-	if (isa_load_resourcev(sc->sc_port, mse_port, MSE_IOSIZE)) {
-		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
-		return ENXIO;
-	}
-#endif
-	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);
-		return ENXIO;
-	}
-	sc->sc_iot = rman_get_bustag(sc->sc_port);
-	sc->sc_ioh = rman_get_bushandle(sc->sc_port);
-
-	if (BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_intr,
-			   INTR_TYPE_TTY, 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);
-		return ENXIO;
-	}
-
-	flags = device_get_flags(dev);
-	sc->mode.accelfactor = (flags & MSE_CONFIG_ACCEL) >> 4;
-	callout_handle_init(&sc->sc_callout);
-
-	sc->sc_dev = make_dev(&mse_cdevsw, unit << 1, 0, 0, 0600,
-			      "mse%d", unit);
-	sc->sc_ndev = make_dev(&mse_cdevsw, (unit<<1)+1, 0, 0, 0600,
-			       "nmse%d", unit);
-
-	return 0;
-}
-
-static	int
-mse_detach(dev)
-	device_t dev;
-{
-	mse_softc_t *sc;
-	int rid;
-
-	sc = device_get_softc(dev);
-	if (sc->sc_flags & MSESC_OPEN)
-		return EBUSY;
-
-	rid = 0;
-	BUS_TEARDOWN_INTR(device_get_parent(dev), 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);
-
-	destroy_dev(sc->sc_dev);
-	destroy_dev(sc->sc_ndev);
-
-	return 0;
-}
-
-/*
- * Exclusive open the mouse, initialize it and enable interrupts.
- */
-static	int
-mseopen(dev, flags, fmt, td)
-	struct cdev *dev;
-	int flags;
-	int fmt;
-	struct thread *td;
-{
-	mse_softc_t *sc;
-	int s;
-
-	sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	if (sc == NULL)
-		return (ENXIO);
-	if (sc->sc_mousetype == MSE_NONE)
-		return (ENXIO);
-	if (sc->sc_flags & MSESC_OPEN)
-		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;
-	sc->sc_callout = timeout(msetimeout, dev, hz*2);
-	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.
-	 */
-	s = spltty();
-	(*sc->sc_enablemouse)(sc->sc_iot, sc->sc_ioh);
-	splx(s);
-	return (0);
-}
-
-/*
- * mseclose: just turn off mouse innterrupts.
- */
-static	int
-mseclose(dev, flags, fmt, td)
-	struct cdev *dev;
-	int flags;
-	int fmt;
-	struct thread *td;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	int s;
-
-	untimeout(msetimeout, dev, sc->sc_callout);
-	callout_handle_init(&sc->sc_callout);
-	s = spltty();
-	(*sc->sc_disablemouse)(sc->sc_iot, sc->sc_ioh);
-	sc->sc_flags &= ~MSESC_OPEN;
-	splx(s);
-	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(dev, uio, ioflag)
-	struct cdev *dev;
-	struct uio *uio;
-	int ioflag;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	int xfer, s, error;
-
-	/*
-	 * If there are no protocol bytes to be read, set up a new protocol
-	 * packet.
-	 */
-	s = spltty(); /* XXX Should be its own spl, but where is imlXX() */
-	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)) {
-				splx(s);
-				return (0);
-			}
-			sc->sc_flags |= MSESC_WANT;
-			error = tsleep(sc, MSEPRI | PCATCH,
-				"mseread", 0);
-			if (error) {
-				splx(s);
-				return (error);
-			}
-		}
-
-		/*
-		 * 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;
-	}
-	splx(s);
-	xfer = min(uio->uio_resid, sc->mode.packetsize - sc->sc_bytesread);
-	error = uiomove(&sc->sc_bytes[sc->sc_bytesread], xfer, uio);
-	if (error)
-		return (error);
-	sc->sc_bytesread += xfer;
-	return(0);
-}
-
-/*
- * mseioctl: process ioctl commands.
- */
-static int
-mseioctl(dev, cmd, addr, flag, td)
-	struct cdev *dev;
-	u_long cmd;
-	caddr_t addr;
-	int flag;
-	struct thread *td;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	mousestatus_t status;
-	int err = 0;
-	int s;
-
-	switch (cmd) {
-
-	case MOUSE_GETHWINFO:
-		s = spltty();
-		*(mousehw_t *)addr = sc->hw;
-		if (sc->mode.level == 0)
-			((mousehw_t *)addr)->model = MOUSE_MODEL_GENERIC;
-		splx(s);
-		break;
-
-	case MOUSE_GETMODE:
-		s = spltty();
-		*(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;
-		}
-		splx(s);
-		break;
-
-	case MOUSE_SETMODE:
-		switch (((mousemode_t *)addr)->level) {
-		case 0:
-		case 1:
-			break;
-		default:
-			return (EINVAL);
-		}
-		if (((mousemode_t *)addr)->accelfactor < -1)
-			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;
-		}
-		break;
-
-	case MOUSE_GETLEVEL:
-		*(int *)addr = sc->mode.level;
-		break;
-
-	case MOUSE_SETLEVEL:
-		switch (*(int *)addr) {
-		case 0:
-			sc->mode.level = *(int *)addr;
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_MSC_PACKETSIZE;
-			break;
-		case 1:
-			sc->mode.level = *(int *)addr;
-			sc->sc_bytesread = sc->mode.packetsize 
-			    = MOUSE_SYS_PACKETSIZE;
-			break;
-		default:
-			return (EINVAL);
-		}
-		break;
-
-	case MOUSE_GETSTATUS:
-		s = spltty();
-		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;
-		splx(s);
-		*(mousestatus_t *)addr = status;
-		break;
-
-	case MOUSE_READSTATE:
-	case MOUSE_READDATA:
-		return (ENODEV);
-
-#if (defined(MOUSE_GETVARS))
-	case MOUSE_GETVARS:
-	case MOUSE_SETVARS:
-		return (ENODEV);
-#endif
-
-	default:
-		return (ENOTTY);
-	}
-	return (err);
-}
-
-/*
- * msepoll: check for mouse input to be processed.
- */
-static	int
-msepoll(dev, events, td)
-	struct cdev *dev;
-	int events;
-	struct thread *td;
-{
-	mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	int s;
-	int revents = 0;
-
-	s = spltty();
-	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 {
-			/*
-			 * Since this is an exclusive open device, any previous
-			 * proc pointer is trash now, so we can just assign it.
-			 */
-			selrecord(td, &sc->sc_selp);
-		}
-	}
-	splx(s);
-	return (revents);
-}
-
-/*
- * msetimeout: watchdog timer routine.
- */
-static void
-msetimeout(arg)
-	void *arg;
-{
-	struct cdev *dev;
-	mse_softc_t *sc;
-
-	dev = (struct cdev *)arg;
-	sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev));
-	if (sc->sc_watchdog) {
-		if (bootverbose)
-			printf("mse%d: lost interrupt?\n", MSE_UNIT(dev));
-		mseintr(sc);
-	}
-	sc->sc_watchdog = TRUE;
-	sc->sc_callout = timeout(msetimeout, dev, hz);
-}
-
-/*
- * mseintr: update mouse status. sc_deltax and sc_deltay are accumulative.
- */
-static void
-mseintr(arg)
-	void *arg;
-{
-	/*
-	 * 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
-	};
-	mse_softc_t *sc = arg;
-	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_iot, sc->sc_ioh, &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);
-	}
-}
-
-#ifndef PC98
-/*
- * 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(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-
-	int sig;
-
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTD, MSE_SETUP);
-		/* set the signature port */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB, MSE_LOGI_SIG);
-
-	DELAY(30000); /* 30 ms delay */
-	sig = bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTB) & 0xFF;
-	if (sig == MSE_LOGI_SIG) {
-		bus_space_write_1(sc->sc_iot, sc->sc_ioh, 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(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-	int dx, dy, but;
-
-	bus_space_write_1(tag, handle, MSE_PORTD, MSE_SETUP);
-	mse_getlogi(tag, handle, &dx, &dy, &but);
-}
-
-/*
- * Disable interrupts for Logitech mouse.
- */
-static void
-mse_disablelogi(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_DISINTR);
-}
-
-/*
- * Get the current dx, dy and button up/down state.
- */
-static void
-mse_getlogi(tag, handle, dx, dy, but)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-	int *dx;
-	int *dy;
-	int *but;
-{
-	register char x, y;
-
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXLOW);
-	x = bus_space_read_1(tag, handle, MSE_PORTA);
-	*but = (x >> 5) & MOUSE_MSC_BUTTONS;
-	x &= 0xf;
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RXHIGH);
-	x |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYLOW);
-	y = (bus_space_read_1(tag, handle, MSE_PORTA) & 0xf);
-	bus_space_write_1(tag, handle, MSE_PORTC, MSE_HOLD | MSE_RYHIGH);
-	y |= (bus_space_read_1(tag, handle, MSE_PORTA) << 4);
-	*dx = x;
-	*dy = y;
-	bus_space_write_1(tag, handle, 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(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-	int i;
-
-	for (i = 0; i < 2; i++)
-		if (bus_space_read_1(sc->sc_iot, sc->sc_ioh, MSE_PORTC) == 0xde)
-			return (1);
-	return (0);
-}
-
-/*
- * Initialize ATI Inport mouse and enable interrupts.
- */
-static void
-mse_enableati(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_RESET);
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
-}
-
-/*
- * Disable interrupts for ATI Inport mouse.
- */
-static void
-mse_disableati(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, 0);
-}
-
-/*
- * Get current dx, dy and up/down button state.
- */
-static void
-mse_getati(tag, handle, dx, dy, but)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-	int *dx;
-	int *dy;
-	int *but;
-{
-	register char byte;
-
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_HOLD);
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_STATUS);
-	*but = ~bus_space_read_1(tag, handle, MSE_PORTB) & MOUSE_MSC_BUTTONS;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DX);
-	byte = bus_space_read_1(tag, handle, MSE_PORTB);
-	*dx = byte;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_DY);
-	byte = bus_space_read_1(tag, handle, MSE_PORTB);
-	*dy = byte;
-	bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE);
-	bus_space_write_1(tag, handle, MSE_PORTB, MSE_INPORT_INTREN);
-}
-#endif
-
-#ifdef PC98
-/*
- * Routines for the PC98 bus mouse.
- */
-
-/*
- * Test for a PC98 bus mouse and return 1 if it is.
- * (do not enable interrupts)
- */
-static int
-mse_probe98m(dev, sc)
-	device_t dev;
-	mse_softc_t *sc;
-{
-	/* mode set */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, MODE, 0x93);
-
-	/* initialize */
-	/* INT disable */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, INT, INT_DISABLE);
-	/* HC = 0 */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, HC, HC_NO_CLEAR);
-	/* HC = 1 */
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, HC, HC_CLEAR);
-
-	return (1);
-}
-
-/*
- * Initialize PC98 bus mouse and enable interrupts.
- */
-static void
-mse_enable98m(tag, handle)
-	bus_space_tag_t tag;
-	bus_space_handle_t handle;
-{
-	bus_space_write_1(tag, handle, INT, INT_ENABLE);    /* INT enable */
-	bus_space_write_1(tag, handle, HC, HC_NO_CLEAR);    /* HC = 0 */
-	bus_space_write_1(tag, handle, HC, HC_CLEAR);       /* HC = 1 */
-}
- 
-/*
- * Disable interrupts for PC98 Bus mouse.
- */
-static void
-mse_disable98m(tag, handle)
-        bus_space_tag_t tag;
-        bus_space_handle_t handle;
-{
-	bus_space_write_1(tag, handle, INT, INT_DISABLE);   /* INT disable */
-	bus_space_write_1(tag, handle, HC, HC_NO_CLEAR);    /* HC = 0 */
-	bus_space_write_1(tag, handle, HC, HC_CLEAR);       /* HC = 1 */
-}
-
-/*
- * Get current dx, dy and up/down button state.
- */
-static void
-mse_get98m(tag, handle, dx, dy, but)
-        bus_space_tag_t tag;
-        bus_space_handle_t handle;
-        int *dx;
-        int *dy;
-        int *but;
-{
-	register char x, y;
-
-	bus_space_write_1(tag, handle, INT, INT_DISABLE);   /* INT disable */
-
-	bus_space_write_1(tag, handle, HC, HC_CLEAR);       /* HC = 1 */
-
-	/* X low */
-	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | XL);
-	x = bus_space_read_1(tag, handle, MSE_PORTA) & 0x0f;
-	/* X high */
-	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | XH);
-	x |= ((bus_space_read_1(tag, handle, MSE_PORTA)  & 0x0f) << 4);
-
-	/* Y low */
-	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | YL);
-	y = (bus_space_read_1(tag, handle, MSE_PORTA) & 0x0f);
-	/* Y high */
-	bus_space_write_1(tag, handle, MSE_PORTC, 0x90 | YH);
-	y |= ((bus_space_read_1(tag, handle, MSE_PORTA) & 0x0f) << 4);
-
-	*but = (bus_space_read_1(tag, handle, MSE_PORTA) >> 5) & 7;
-
-	*dx = x;
-	*dy = y;
-
-	bus_space_write_1(tag, handle, HC, HC_NO_CLEAR);    /* HC = 0 */
-
-	bus_space_write_1(tag, handle, INT, INT_ENABLE);    /* INT enable */
-}
-#endif