Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset PS/2 devices before probing as synaptics touchpad.

Browse Source 
Patch from dukscry, fixes #8616.
This commit is contained in:
Adrien Destugues 2014-12-03 13:18:47 +01:00
parent 721e32f7a0
commit c2872486ec
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp
View File

@ -57,6 +57,7 @@ send_touchpad_arg_timeout(ps2_dev *dev, uint8 arg, bigtime_t timeout)
{ {
int8 i; int8 i;
uint8 val[8]; uint8 val[8];
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
val[2 * i] = (arg >> (6 - 2 * i)) & 3; val[2 * i] = (arg >> (6 - 2 * i)) & 3;
val[2 * i + 1] = 0xE8; val[2 * i + 1] = 0xE8;
@ -280,6 +281,15 @@ probe_synaptics(ps2_dev *dev)
status_t status; status_t status;
TRACE("SYNAPTICS: probe\n"); TRACE("SYNAPTICS: probe\n");
// We reset the device here because it may have been left in a confused
// state by a previous probing attempt. Some synaptics touchpads are known
// to lockup when we attempt to detect them as IBM trackoints.
ps2_reset_mouse(dev);
// And after resetting we must wait a little for the device to become ready
// again...
snooze(400000);
status = send_touchpad_arg(dev, 0x00); status = send_touchpad_arg(dev, 0x00);
if (status != B_OK) if (status != B_OK)
return status; return status;