From: Vojtech Pavlik <vojtech@suse.cz>
To: torvalds@osdl.org, vojtech@ucw.cz, linux-kernel@vger.kernel.org
Subject: [PATCH 42/44] Do a full reset of Synaptics touchpad if extended protocol probes failed
Date: Tue, 16 Mar 2004 15:19:38 +0100 [thread overview]
Message-ID: <10794467783476@twilight.ucw.cz> (raw)
In-Reply-To: <1079446778856@twilight.ucw.cz>
You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/input
===================================================================
ChangeSet@1.1608.54.11, 2004-03-11 02:20:12-05:00, dtor_core@ameritech.net
Input: do a full reset of Synaptics touchpad if extended protocol
probes failed, otherwise trackpoint on the pass-through port
may stop working (reset-disable isn't enough to revive it)
psmouse-base.c | 23 +++++++++++++++++++++--
psmouse.h | 1 +
synaptics.c | 13 +------------
3 files changed, 23 insertions(+), 14 deletions(-)
===================================================================
diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c Tue Mar 16 13:17:30 2004
+++ b/drivers/input/mouse/psmouse-base.c Tue Mar 16 13:17:30 2004
@@ -287,6 +287,24 @@
return 0;
}
+
+/*
+ * psmouse_reset() resets the mouse into power-on state.
+ */
+int psmouse_reset(struct psmouse *psmouse)
+{
+ unsigned char param[2];
+
+ if (psmouse_command(psmouse, param, PSMOUSE_CMD_RESET_BAT))
+ return -1;
+
+ if (param[0] != PSMOUSE_RET_BAT && param[1] != PSMOUSE_RET_ID)
+ return -1;
+
+ return 0;
+}
+
+
/*
* Genius NetMouse magic init.
*/
@@ -416,6 +434,7 @@
* pass through port it could get disabled while probing for protocol
* extensions.
*/
+ psmouse_reset(psmouse);
psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS);
}
@@ -540,8 +559,8 @@
static void psmouse_cleanup(struct serio *serio)
{
struct psmouse *psmouse = serio->private;
- unsigned char param[2];
- psmouse_command(psmouse, param, PSMOUSE_CMD_RESET_BAT);
+
+ psmouse_reset(psmouse);
}
/*
diff -Nru a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
--- a/drivers/input/mouse/psmouse.h Tue Mar 16 13:17:30 2004
+++ b/drivers/input/mouse/psmouse.h Tue Mar 16 13:17:30 2004
@@ -65,6 +65,7 @@
#define PSMOUSE_SYNAPTICS 7
int psmouse_command(struct psmouse *psmouse, unsigned char *param, int command);
+int psmouse_reset(struct psmouse *psmouse);
extern int psmouse_smartscroll;
extern unsigned int psmouse_rate;
diff -Nru a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
--- a/drivers/input/mouse/synaptics.c Tue Mar 16 13:17:30 2004
+++ b/drivers/input/mouse/synaptics.c Tue Mar 16 13:17:30 2004
@@ -92,17 +92,6 @@
return 0;
}
-static int synaptics_reset(struct psmouse *psmouse)
-{
- unsigned char r[2];
-
- if (psmouse_command(psmouse, r, PSMOUSE_CMD_RESET_BAT))
- return -1;
- if (r[0] == PSMOUSE_RET_BAT && r[1] == PSMOUSE_RET_ID)
- return 0;
- return -1;
-}
-
/*
* Read the model-id bytes from the touchpad
* see also SYN_MODEL_* macros
@@ -197,7 +186,7 @@
{
int retries = 0;
- while ((retries++ < 3) && synaptics_reset(psmouse))
+ while ((retries++ < 3) && psmouse_reset(psmouse))
printk(KERN_ERR "synaptics reset failed\n");
if (synaptics_identify(psmouse))
next prev parent reply other threads:[~2004-03-16 17:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <10794467771611@twilight.ucw.cz>
2004-03-16 14:19 ` [PATCH 29/44] HID quirk (badpad) for NEC gamepad Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 30/44] Separate HID quirks for different A4Tech mice Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 31/44] Fix i8042 PS/2 mouse on ARM Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 32/44] Update of Wacom driver from Ping Cheng (from Wacom) Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 33/44] Fix for devices that need padded HID packets Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 34/44] Fix a memory leak in ns558.c Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 35/44] HID quirk (badpad) for Chic gamepad Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 36/44] Don't define DEBUG in hid-ff by default Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 37/44] Restore LED state in atkbd.c after resume Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 38/44] Fix oops (NULL pointer dereference) on resume in psmouse.c Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 39/44] Fix an endless loop in hid-core.c if device has empty reports Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 40/44] Fix for HID devices which need nonzero idle for the ctrl pipe Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 41/44] Don't ignore PS/2 data immediately after disconnect Vojtech Pavlik
2004-03-16 14:19 ` Vojtech Pavlik [this message]
2004-03-16 14:19 ` [PATCH 43/44] Enable relative mode and gestures if Synaptics uses non-native protocol Vojtech Pavlik
2004-03-16 14:19 ` [PATCH 44/44] Fixes in wacom.c: SLAB_ATOMIC->GFP_KERNEL and count bug in open() Vojtech Pavlik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10794467783476@twilight.ucw.cz \
--to=vojtech@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=vojtech@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox