From 85ab8ef65047d8a8d5d819659362379620cf9aaf Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 5 Sep 2021 16:32:34 +0200 Subject: [PATCH] ps2 synaptics: don't spam the syslog when nothing happens MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some logs are emitted even when nothing at all is happening, constantly spamming the syslog. Log them only the first time they happen. Change-Id: I81511a7ce245c2141fa3dcd141b2f3732d9b51ad Reviewed-on: https://review.haiku-os.org/c/haiku/+/4424 Tested-by: Commit checker robot Reviewed-by: Jérôme Duval --- src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp | 9 ++++++--- src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp b/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp index 16e8f4f4a3..366a7beeed 100644 --- a/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp @@ -375,7 +375,8 @@ TouchpadMovement::EventToMovement(touch_event *event, mouse_movement *movement) movement->timestamp = system_time(); if ((movement->timestamp - fTapTime) > fTapTimeOUT) { - TRACE("TouchpadMovement: tap gesture timed out\n"); + if (fTapStarted) + TRACE("TouchpadMovement: tap gesture timed out\n"); fTapStarted = false; if (!fDoubleClick || (movement->timestamp - fTapTime) > 2 * fTapTimeOUT) { @@ -495,7 +496,8 @@ TouchpadMovement::_NoTouchToMovement(touch_event *event, { uint32 buttons = event->buttons; - TRACE("TouchpadMovement: no touch event\n"); + if (fMovementStarted) + TRACE("TouchpadMovement: no touch event\n"); fScrollingStarted = false; fMovementStarted = false; @@ -508,9 +510,10 @@ TouchpadMovement::_NoTouchToMovement(touch_event *event, // if the movement stopped switch off the tap drag when timeout is expired if ((movement->timestamp - fTapTime) > fTapTimeOUT) { + if (fTapdragStarted) + TRACE("TouchpadMovement: tap drag gesture timed out\n"); fTapdragStarted = false; fValidEdgeMotion = false; - TRACE("TouchpadMovement: tap drag gesture timed out\n"); } if (abs(fTapDeltaX) > 15 || abs(fTapDeltaY) > 15) { diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp index 028824a72a..c821b4f3e1 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp @@ -612,9 +612,9 @@ synaptics_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) switch (op) { case MS_READ: - TRACE("SYNAPTICS: MS_READ get event\n"); if ((status = get_synaptics_movment(cookie, &movement)) != B_OK) return status; + TRACE("SYNAPTICS: MS_READ get event\n"); return user_memcpy(buffer, &movement, sizeof(movement)); case MS_IS_TOUCHPAD: