Merge pmsi(4) into pms(4). From Alexandr Shadchin on tech@.

3 files changed, 48 insertions, 418 deletions

diff --git a/sys/dev/pckbc/files.pckbc b/sys/dev/pckbc/files.pckbc
index 560b4e2357c..8b3d4e04dd9 100644
--- a/sys/dev/pckbc/files.pckbc
+++ b/sys/dev/pckbc/files.pckbc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pckbc,v 1.8 2007/10/18 17:39:54 miod Exp $
+# $OpenBSD: files.pckbc,v 1.9 2010/09/26 20:39:08 miod Exp $
 # $NetBSD: files.pckbc,v 1.6 1999/01/23 16:05:56 drochner Exp $
 # devices attached at pckbc, for use with wscons
 
@@ -10,7 +10,3 @@ file	dev/pckbc/wskbdmap_mfii.c		pckbd
 device	pms: wsmousedev
 attach	pms at pckbcslot
 file	dev/pckbc/pms.c				pms
-
-device	pmsi: wsmousedev
-attach	pmsi at pckbcslot
-file	dev/pckbc/pms_intelli.c			pmsi
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index e0e7026d873..fea15ba5416 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.3 2010/07/22 14:25:41 deraadt Exp $ */
+/* $OpenBSD: pms.c,v 1.4 2010/09/26 20:39:08 miod Exp $ */
 /* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
 
 /*-
@@ -48,9 +48,11 @@ struct pms_softc {		/* driver status information */
 #define PMS_STATE_DISABLED	0
 #define PMS_STATE_ENABLED	1
 #define PMS_STATE_SUSPENDED	2
+
+	int intelli;
 	int inputstate;
 	u_int buttons, oldbuttons;	/* mouse button status */
-	signed char dx;
+	signed char dx, dy;
 
 	struct device *sc_wsmousedev;
 };
@@ -70,6 +72,8 @@ int	pms_ioctl(void *, u_long, caddr_t, int, struct proc *);
 int	pms_enable(void *);
 void	pms_disable(void *);
 
+int	pms_setintellimode(pckbc_tag_t, pckbc_slot_t);
+
 const struct wsmouse_accessops pms_accessops = {
 	pms_enable,
 	pms_ioctl,
@@ -77,6 +81,29 @@ const struct wsmouse_accessops pms_accessops = {
 };
 
 int
+pms_setintellimode(pckbc_tag_t tag, pckbc_slot_t slot)
+{
+	u_char cmd[2], resp[1];
+	int i, res;
+	static const u_char rates[] = {200, 100, 80};
+
+	cmd[0] = PMS_SET_SAMPLE;
+	for (i = 0; i < 3; i++) {
+		cmd[1] = rates[i];
+		res = pckbc_enqueue_cmd(tag, slot, cmd, 2, 0, 0, NULL);
+		if (res)
+			return (0);
+	}
+
+	cmd[0] = PMS_SEND_DEV_ID;
+	res = pckbc_enqueue_cmd(tag, slot, cmd, 1, 1, 0, resp);
+	if (res || resp[0] != 3)
+		return (0);
+
+	return (1);
+}
+
+int
 pmsprobe(parent, match, aux)
 	struct device *parent;
 	void *match;
@@ -204,6 +231,8 @@ pms_change_state(struct pms_softc *sc, int newstate)
 
 		pckbc_slot_enable(sc->sc_kbctag, sc->sc_kbcslot, 1);
 
+		sc->intelli = pms_setintellimode(sc->sc_kbctag, sc->sc_kbcslot);
+
 		cmd[0] = PMS_DEV_ENABLE;
 		res = pckbc_enqueue_cmd(sc->sc_kbctag, sc->sc_kbcslot,
 		    cmd, 1, 0, 1, 0);
@@ -320,7 +349,7 @@ void *vsc;
 int data;
 {
 	struct pms_softc *sc = vsc;
-	signed char dy;
+	signed char dz = 0;
 	u_int changed;
 
 	if (sc->sc_state != PMS_STATE_ENABLED) {
@@ -347,18 +376,28 @@ int data;
 		break;
 
 	case 2:
-		dy = data;
-		dy = (dy == -128) ? -127 : dy;
+		sc->dy = data;
+		sc->dy = (sc->dy == -128) ? -127 : sc->dy;
+		++sc->inputstate;
+		break;
+
+	case 3:
+		dz = data;
+		dz = (dz == -128) ? -127 : dz;
+		++sc->inputstate;
+		break;
+	}
+
+	if ((sc->inputstate == 3 && sc->intelli == 0) || sc->inputstate == 4) {
 		sc->inputstate = 0;
 
 		changed = (sc->buttons ^ sc->oldbuttons);
 		sc->oldbuttons = sc->buttons;
 
-		if (sc->dx || dy || changed)
+		if (sc->dx || sc->dy || dz || changed)
 			wsmouse_input(sc->sc_wsmousedev,
-				      sc->buttons, sc->dx, dy, 0, 0,
+				      sc->buttons, sc->dx, sc->dy, dz, 0,
 				      WSMOUSE_INPUT_DELTA);
-		break;
 	}
 
 	return;
diff --git a/sys/dev/pckbc/pms_intelli.c b/sys/dev/pckbc/pms_intelli.c
deleted file mode 100644
index 8e14798c036..00000000000
--- a/sys/dev/pckbc/pms_intelli.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* $OpenBSD: pms_intelli.c,v 1.5 2010/07/30 17:15:14 krw Exp $ */
-/* $NetBSD: psm_intelli.c,v 1.8 2000/06/05 22:20:57 sommerfeld Exp $ */
-
-/*-
- * Copyright (c) 1994 Charles M. Hannum.
- * Copyright (c) 1992, 1993 Erik Forsberg.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/ioctl.h>
-
-#include <machine/bus.h>
-
-#include <dev/ic/pckbcvar.h>
-
-#include <dev/pckbc/pmsreg.h>
-
-#include <dev/wscons/wsconsio.h>
-#include <dev/wscons/wsmousevar.h>
-
-struct pmsi_softc {		/* driver status information */
-	struct device sc_dev;
-
-	pckbc_tag_t sc_kbctag;
-	int sc_kbcslot;
-
-	int sc_state;
-#define PMSI_STATE_DISABLED	0
-#define PMSI_STATE_ENABLED	1
-#define PMSI_STATE_SUSPENDED	2
-
-	int inputstate;
-	u_int buttons, oldbuttons;	/* mouse button status */
-	signed char dx, dy;
-
-	struct device *sc_wsmousedev;
-};
-
-int pmsiprobe(struct device *, void *, void *);
-void pmsiattach(struct device *, struct device *, void *);
-int pmsiactivate(struct device *, int);
-void pmsiinput(void *, int);
-
-struct cfattach pmsi_ca = {
-	sizeof(struct pmsi_softc), pmsiprobe, pmsiattach, NULL,
-	pmsiactivate
-};
-
-int	pmsi_change_state(struct pmsi_softc *, int);
-int	pmsi_ioctl(void *, u_long, caddr_t, int, struct proc *);
-int	pmsi_enable(void *);
-void	pmsi_disable(void *);
-
-const struct wsmouse_accessops pmsi_accessops = {
-	pmsi_enable,
-	pmsi_ioctl,
-	pmsi_disable,
-};
-
-int	pmsi_setintellimode(pckbc_tag_t, pckbc_slot_t, int);
-
-int
-pmsi_setintellimode(pckbc_tag_t tag, pckbc_slot_t slot, int poll)
-{
-	u_char cmd[2], resp[1];
-	int i, res;
-	static const u_char rates[] = {200, 100, 80};
-
-	cmd[0] = PMS_SET_SAMPLE;
-	for (i = 0; i < 3; i++) {
-		cmd[1] = rates[i];
-		if (poll)
-			res = pckbc_poll_cmd(tag, slot, cmd, 2, 0, NULL, 0);
-		else
-			res = pckbc_enqueue_cmd(tag, slot, cmd, 2, 0, 0, NULL);
-		if (res)
-			return (res);
-	}
-
-	cmd[0] = PMS_SEND_DEV_ID;
-	if (poll)
-		res = pckbc_poll_cmd(tag, slot, cmd, 1, 1, resp, 0);
-	else
-		res = pckbc_enqueue_cmd(tag, slot, cmd, 1, 1, 0, resp);
-	if (res)
-		return (res);
-	if (resp[0] != 3)
-		return (ENXIO);
-
-	return (0);
-}
-
-int
-pmsiprobe(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	struct pckbc_attach_args *pa = aux;
-	u_char cmd[1], resp[2];
-	int res;
-
-	if (pa->pa_slot != PCKBC_AUX_SLOT)
-		return (0);
-
-	/* Flush any garbage. */
-	pckbc_flush(pa->pa_tag, pa->pa_slot);
-
-	/* reset the device */
-	cmd[0] = PMS_RESET;
-	res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 2, resp, 1);
-	if (res) {
-#ifdef DEBUG
-		printf("pmsiprobe: reset error %d\n", res);
-#endif
-		return (0);
-	}
-	if (resp[0] != PMS_RSTDONE) {
-		printf("pmsiprobe: reset response 0x%x\n", resp[0]);
-		return (0);
-	}
-
-	/* get type number (0 = mouse) */
-	if (resp[1] != 0) {
-#ifdef DEBUG
-		printf("pmsiprobe: type 0x%x\n", resp[1]);
-#endif
-		return (0);
-	}
-
-	if ((res = pmsi_setintellimode(pa->pa_tag, pa->pa_slot, 1))) {
-#ifdef DEBUG
-		printf("pmsiprobe: intellimode -> %d\n", res);
-#endif
-		return (0);
-	}
-
-	return (20);
-}
-
-void
-pmsiattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	struct pmsi_softc *sc = (void *)self;
-	struct pckbc_attach_args *pa = aux;
-	struct wsmousedev_attach_args a;
-	u_char cmd[1], resp[2];
-	int res;
-
-	sc->sc_kbctag = pa->pa_tag;
-	sc->sc_kbcslot = pa->pa_slot;
-
-	printf("\n");
-
-	/* Flush any garbage. */
-	pckbc_flush(pa->pa_tag, pa->pa_slot);
-
-	/* reset the device */
-	cmd[0] = PMS_RESET;
-	res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 2, resp, 1);
-#ifdef DEBUG
-	if (res || resp[0] != PMS_RSTDONE || resp[1] != 0) {
-		printf("pmsiattach: reset error\n");
-		return;
-	}
-#endif
-	res = pmsi_setintellimode(pa->pa_tag, pa->pa_slot, 1);
-#ifdef DEBUG
-	if (res) {
-		printf("pmsiattach: error setting intelli mode\n");
-		return;
-	}
-#endif
-
-	/* Other initialization was done by pmsiprobe. */
-	sc->inputstate = 0;
-	sc->oldbuttons = 0;
-
-	pckbc_set_inputhandler(sc->sc_kbctag, sc->sc_kbcslot,
-			       pmsiinput, sc, sc->sc_dev.dv_xname);
-
-	a.accessops = &pmsi_accessops;
-	a.accesscookie = sc;
-
-	/*
-	 * Attach the wsmouse, saving a handle to it.
-	 * Note that we don't need to check this pointer against NULL
-	 * here or in pmsintr, because if this fails pmsi_enable() will
-	 * never be called, so pmsiinput() will never be called.
-	 */
-	sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint);
-
-	/* no interrupts until enabled */
-	cmd[0] = PMS_DEV_DISABLE;
-	res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 0, NULL, 0);
-	if (res)
-		printf("pmsiattach: disable error\n");
-	pckbc_slot_enable(sc->sc_kbctag, sc->sc_kbcslot, 0);
-}
-
-int
-pmsiactivate(struct device *self, int act)
-{
-	struct pmsi_softc *sc = (struct pmsi_softc *)self;
-
-	switch (act) {
-	case DVACT_SUSPEND:
-		if (sc->sc_state == PMSI_STATE_ENABLED)
-			pmsi_change_state(sc, PMSI_STATE_SUSPENDED);
-		break;
-	case DVACT_RESUME:
-		if (sc->sc_state == PMSI_STATE_SUSPENDED)
-			pmsi_change_state(sc, PMSI_STATE_ENABLED);
-		break;
-	}
-	return (0);
-}
-
-int
-pmsi_change_state(struct pmsi_softc *sc, int newstate)
-{
-	u_char cmd[1];
-	int res;
-
-	switch (newstate) {
-	case PMSI_STATE_ENABLED:
-		if (sc->sc_state == PMSI_STATE_ENABLED)
-			return EBUSY;
-		sc->inputstate = 0;
-		sc->oldbuttons = 0;
-
-		pckbc_slot_enable(sc->sc_kbctag, sc->sc_kbcslot, 1);
-
-		pckbc_flush(sc->sc_kbctag, sc->sc_kbcslot);
-		res = pmsi_setintellimode(sc->sc_kbctag, sc->sc_kbcslot, 0);
-#ifdef DEBUG
-		if (res) {
-			printf("pmsi_change_state: error setting intelli mode\n");
-		}
-#endif
-
-		cmd[0] = PMS_DEV_ENABLE;
-		res = pckbc_enqueue_cmd(sc->sc_kbctag, sc->sc_kbcslot,
-		    cmd, 1, 0, 1, 0);
-		if (res)
-			printf("pmsi_change_state: command error\n");
-		sc->sc_state = newstate;
-		break;
-	case PMSI_STATE_DISABLED:
-		/* FALLTHROUGH */
-	case PMSI_STATE_SUSPENDED:
-	        cmd[0] = PMS_DEV_DISABLE;
-	        res = pckbc_enqueue_cmd(sc->sc_kbctag, sc->sc_kbcslot,
-		    cmd, 1, 0, 1, 0);
-	        if (res)
-	                printf("pmsi_change_state: command error\n");
-	        pckbc_slot_enable(sc->sc_kbctag, sc->sc_kbcslot, 0);
-		sc->sc_state = newstate;
-		break;
-	}
-	return 0;
-}
-
-int
-pmsi_enable(void *v)
-{
-	struct pmsi_softc *sc = v;
-
-	return pmsi_change_state(sc, PMSI_STATE_ENABLED);
-}
-
-
-void
-pmsi_disable(void *v)
-{
-	struct pmsi_softc *sc = v;
-
-	pmsi_change_state(sc, PMSI_STATE_DISABLED);
-}
-
-int
-pmsi_ioctl(v, cmd, data, flag, p)
-	void *v;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	struct proc *p;
-{
-	struct pmsi_softc *sc = v;
-	u_char kbcmd[2];
-	int i;
-
-	switch (cmd) {
-	case WSMOUSEIO_GTYPE:
-		*(u_int *)data = WSMOUSE_TYPE_PS2;
-		break;
-		
-	case WSMOUSEIO_SRES:
-		i = ((int) *(u_int *)data - 12) / 25;		
-		/* valid values are {0,1,2,3} */
-		if (i < 0)
-			i = 0;
-		if (i > 3)
-			i = 3;
-
-		kbcmd[0] = PMS_SET_RES;
-		kbcmd[1] = (unsigned char) i;			
-		i = pckbc_enqueue_cmd(sc->sc_kbctag, sc->sc_kbcslot, kbcmd, 
-		    2, 0, 1, 0);
-		
-		if (i)
-			printf("pmsi_ioctl: SET_RES command error\n");
-		break;
-		
-	default:
-		return (-1);
-	}
-	return (0);
-}
-
-/* Masks for the first byte of a packet */
-#define PS2LBUTMASK 0x01
-#define PS2RBUTMASK 0x02
-#define PS2MBUTMASK 0x04
-
-void pmsiinput(vsc, data)
-void *vsc;
-int data;
-{
-	struct pmsi_softc *sc = vsc;
-	signed char dz;
-	u_int changed;
-
-	if (sc->sc_state != PMSI_STATE_ENABLED) {
-		/* Interrupts are not expected.  Discard the byte. */
-		return;
-	}
-
-	switch (sc->inputstate) {
-
-	case 0:
-		if ((data & 0xc0) == 0) { /* no ovfl, bit 3 == 1 too? */
-			sc->buttons = ((data & PS2LBUTMASK) ? 0x1 : 0) |
-			    ((data & PS2MBUTMASK) ? 0x2 : 0) |
-			    ((data & PS2RBUTMASK) ? 0x4 : 0);
-			++sc->inputstate;
-		}
-		break;
-
-	case 1:
-		sc->dx = data;
-		/* Bounding at -127 avoids a bug in XFree86. */
-		sc->dx = (sc->dx == -128) ? -127 : sc->dx;
-		++sc->inputstate;
-		break;
-
-	case 2:
-		sc->dy = data;
-		sc->dy = (sc->dy == -128) ? -127 : sc->dy;
-		++sc->inputstate;
-		break;
-
-	case 3:
-		dz = data;
-		dz = (dz == -128) ? -127 : dz;
-		sc->inputstate = 0;
-
-		changed = (sc->buttons ^ sc->oldbuttons);
-		sc->oldbuttons = sc->buttons;
-
-		if (sc->dx || sc->dy || dz || changed)
-			wsmouse_input(sc->sc_wsmousedev,
-				      sc->buttons, sc->dx, sc->dy, dz, 0,
-				      WSMOUSE_INPUT_DELTA);
-		break;
-	}
-
-	return;
-}
-
-struct cfdriver pmsi_cd = {
-	NULL, "pmsi", DV_DULL
-};