i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ps/2 elantech: Return B_BAD_DATA when there is no new event from the touchpad

Browse Source 
This fixes many unstabilities and unexpected behaviours, as returning B_ERROR
triggers a device restart and returning B_OK with incomplete or not initialised
data makes movement makers and mouse input server device add-on code to process
that as if it were completely correct.

That would trigger many phantom clicks, cursor jumping, coursor desapearing and other
collection of misbehaviours.

Change-Id: I05c40cb4f17e28a6b93f6e17984d6a1171fdd00a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/9937
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Samuel Rodríguez Pérez
2026-01-02 11:01:29 +00:00
committed by Adrien Destugues
parent d7a262944a
commit 1861f096a2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
+8 -4
View File
@@ -67,6 +67,10 @@ const char* kElantechPath[4] = {
#define HEAD_PACKET 0x1 #define HEAD_PACKET 0x1
#define MOTION_PACKET 0x2 #define MOTION_PACKET 0x2
// Error code used by MouseDevice::_ControlThread() in MouseInputDevice.cpp to reuse previous
// event, basically ignoring the packet.
#define IGNORE_EVENT B_BAD_DATA
static touchpad_specs gHardwareSpecs; static touchpad_specs gHardwareSpecs;
@@ -130,7 +134,7 @@ elantech_process_packet_v4(elantech_cookie *cookie, touchpad_movement *_event,
if (invalidAt != 0) { if (invalidAt != 0) {
TRACE("ELANTECH: Failed v4 sanity check at %d.\n", invalidAt); TRACE("ELANTECH: Failed v4 sanity check at %d.\n", invalidAt);
return B_ERROR; return IGNORE_EVENT;
} }
uint8 packet_type = packet[3] & 3; uint8 packet_type = packet[3] & 3;
@@ -177,7 +181,7 @@ elantech_process_packet_v4(elantech_cookie *cookie, touchpad_movement *_event,
TRACE("ELANTECH: Fingers %d, raw %x (HEAD)\n", (packet[3] & 0xe0) >>5, packet[3]); TRACE("ELANTECH: Fingers %d, raw %x (HEAD)\n", (packet[3] & 0xe0) >>5, packet[3]);
// only process first finger // only process first finger
if ((packet[3] & 0xe0) != 0x20) if ((packet[3] & 0xe0) != 0x20)
return B_OK; return IGNORE_EVENT;
event.zPressure = (packet[1] & 0xf0) | ((packet[4] & 0xf0) >> 4); event.zPressure = (packet[1] & 0xf0) | ((packet[4] & 0xf0) >> 4);
@@ -210,7 +214,7 @@ elantech_process_packet_v4(elantech_cookie *cookie, touchpad_movement *_event,
* byte 3 ~ 5 for another finger * byte 3 ~ 5 for another finger
*/ */
TRACE("ELANTECH: Fingers %d, raw %x (MOTION)\n", (packet[3] & 0xe0) >>5, packet[3]); //Most likely palm TRACE("ELANTECH: Fingers %d, raw %x (MOTION)\n", (packet[3] & 0xe0) >>5, packet[3]); //Most likely palm
if (cookie->fingers == 0) return B_OK; if (cookie->fingers == 0) return IGNORE_EVENT;
//handle overflow and delta values //handle overflow and delta values
if ((packet[0] & 0x10) != 0) { if ((packet[0] & 0x10) != 0) {
event.xPosition = cookie->x += 5 * (int8)packet[1]; event.xPosition = cookie->x += 5 * (int8)packet[1];
@@ -225,7 +229,7 @@ elantech_process_packet_v4(elantech_cookie *cookie, touchpad_movement *_event,
break; break;
default: default:
dprintf("ELANTECH: unknown packet type %d\n", packet_type); dprintf("ELANTECH: unknown packet type %d\n", packet_type);
return B_ERROR; return IGNORE_EVENT;
} }
event.buttons = 0; event.buttons = 0;