From 551e01b126db49d290b7bf466016de0b27611b40 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Mon, 12 Jul 1999 13:40:21 +0000
Subject: [PATCH] Implement a kludge for some wheeled mice for which infamous
 "psmintr: out of sync..." messages is generated and the wheel movement is not
 recognized.

The trick is found by Takashi Nishida.
---
 sys/dev/atkbdc/psm.c | 18 ++++++++++++++++--
 sys/isa/psm.c        | 18 ++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 96260238a57c..de3b6ceddb4c 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.11 1999/06/03 12:40:53 yokota Exp $
+ * $Id: psm.c,v 1.12 1999/07/04 14:58:34 phk Exp $
  */
 
 /*
@@ -992,14 +992,28 @@ psmprobe(device_t dev)
     sc->mode.packetsize = vendortype[i].packetsize;
 
     /* set mouse parameters */
+#if 0
+    /* 
+     * A version of Logitech FirstMouse+ won't report wheel movement,
+     * if SET_DEFAULTS is sent...  Don't use this command.
+     * This fix was found by Takashi Nishida.
+     */
     i = send_aux_command(sc->kbdc, PSMC_SET_DEFAULTS);
     if (verbose >= 2)
 	printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
+#endif
     if (sc->config & PSM_CONFIG_RESOLUTION) {
         sc->mode.resolution
 	    = set_mouse_resolution(sc->kbdc, 
-	        (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+				   (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+    } else if (sc->mode.resolution >= 0) {
+	sc->mode.resolution
+	    = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
     }
+    if (sc->mode.rate > 0) {
+	sc->mode.rate = set_mouse_sampling_rate(sc->kbdc, sc->dflt_mode.rate);
+    }
+    set_mouse_scaling(sc->kbdc, 1);
 
     /* request a data packet and extract sync. bits */
     if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index 96260238a57c..de3b6ceddb4c 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.11 1999/06/03 12:40:53 yokota Exp $
+ * $Id: psm.c,v 1.12 1999/07/04 14:58:34 phk Exp $
  */
 
 /*
@@ -992,14 +992,28 @@ psmprobe(device_t dev)
     sc->mode.packetsize = vendortype[i].packetsize;
 
     /* set mouse parameters */
+#if 0
+    /* 
+     * A version of Logitech FirstMouse+ won't report wheel movement,
+     * if SET_DEFAULTS is sent...  Don't use this command.
+     * This fix was found by Takashi Nishida.
+     */
     i = send_aux_command(sc->kbdc, PSMC_SET_DEFAULTS);
     if (verbose >= 2)
 	printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
+#endif
     if (sc->config & PSM_CONFIG_RESOLUTION) {
         sc->mode.resolution
 	    = set_mouse_resolution(sc->kbdc, 
-	        (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+				   (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+    } else if (sc->mode.resolution >= 0) {
+	sc->mode.resolution
+	    = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
     }
+    if (sc->mode.rate > 0) {
+	sc->mode.rate = set_mouse_sampling_rate(sc->kbdc, sc->dflt_mode.rate);
+    }
+    set_mouse_scaling(sc->kbdc, 1);
 
     /* request a data packet and extract sync. bits */
     if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {