From fdbbdccc0568fd34dfdef028ad50d3b7722e0cfa Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Sep 2021 12:45:24 +0200
Subject: [PATCH] ps2: allow more selective tracing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In some cases, we don't need the full tracking of every byte received at
the PS2 level, but higher level traces from specific devices will be
enough.

Change-Id: I31984e6b7784b5d033b457f43f3793f772213f4a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4423
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
---
 src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp     |  8 ++++++++
 src/add-ons/kernel/bus_managers/ps2/ps2_common.cpp   |  8 ++++++++
 src/add-ons/kernel/bus_managers/ps2/ps2_common.h     | 12 +++++++++---
 src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp      |  8 ++++++++
 src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp |  8 ++++++++
 src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp |  7 +++++++
 src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp  |  8 ++++++++
 .../kernel/bus_managers/ps2/ps2_standard_mouse.cpp   |  8 ++++++++
 .../kernel/bus_managers/ps2/ps2_synaptics.cpp        |  7 +++++++
 .../kernel/bus_managers/ps2/ps2_trackpoint.cpp       |  8 ++++++++
 10 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
index cf17797051..7c9f93c257 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
@@ -18,6 +18,14 @@
 #include "ps2_service.h"
 
 
+//#define TRACE_PS2_ALPS
+#ifdef TRACE_PS2_APLS
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 static int32 generate_event(timer* timer);
 
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_common.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_common.cpp
index d0560f272b..2db0cc2b77 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_common.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_common.cpp
@@ -18,6 +18,14 @@
 #include "ps2_dev.h"
 
 
+//#define TRACE_PS2_COMMON
+#ifdef TRACE_PS2_COMMON
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 isa_module_info *gIsa = NULL;
 bool gActiveMultiplexingEnabled = false;
 sem_id gControllerSem;
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_common.h b/src/add-ons/kernel/bus_managers/ps2/ps2_common.h
index c32c7349f0..ee16aef6ad 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_common.h
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_common.h
@@ -32,9 +32,15 @@
 
 //#define TRACE_PS2
 #ifdef TRACE_PS2
-#	define TRACE(x...) dprintf(x)
-#else
-#	define TRACE(x...)
+#define TRACE_PS2_ALPS
+#define TRACE_PS2_COMMON
+#define TRACE_PS2_DEV
+#define TRACE_PS2_ELANTECH
+#define TRACE_PS2_MOUSE
+#define TRACE_PS2_KEYBOARD
+#define TRACE_PS2_SERVICE
+#define TRACE_PS2_SYNAPTICS
+#define TRACE_PS2_TRACKPOINT
 #endif
 
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
index 229f0d736d..4d018580f6 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
@@ -24,6 +24,14 @@
 #include <string.h>
 
 
+//#define TRACE_PS2_DEV
+#ifdef TRACE_PS2_DEV
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 ps2_dev ps2_device[PS2_DEVICE_COUNT];
 
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
index b6b254c219..39a748f156 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
@@ -18,6 +18,14 @@
 #include "ps2_service.h"
 
 
+//#define TRACE_PS2_ELANTECH
+#ifdef TRACE_PS2_ELANTECH
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 static int32 generate_event(timer* timer);
 
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
index 15ec67d391..a26874fd2c 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
@@ -30,6 +30,13 @@
 #define KEY_BUFFER_SIZE 100
 	// we will buffer 100 key strokes before we start dropping them
 
+//#define TRACE_PS2_KEYBOARD
+#ifdef TRACE_PS2_KEYBOARD
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
 enum {
 	LED_SCROLL 	= 1,
 	LED_NUM 	= 2,
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
index ec8abae86a..52be1bdfb3 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
@@ -21,6 +21,14 @@
 #endif
 
 
+//#define TRACE_PS2_SERVICE
+#ifdef TRACE_PS2_SERVICE
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 typedef struct {
 	uint32		id;
 	ps2_dev *	dev;
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp
index d274737867..a43c7491aa 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp
@@ -64,6 +64,14 @@
 #include "ps2_standard_mouse.h"
 
 
+//#define TRACE_PS2_MOUSE
+#ifdef TRACE_PS2_MOUSE
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 const char* kStandardMousePath[4] = {
 	"input/mouse/ps2/standard_0",
 	"input/mouse/ps2/standard_1",
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 139203398a..028824a72a 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp
@@ -21,6 +21,13 @@
 #include "ps2_service.h"
 
 
+//#define TRACE_PS2_SYNAPTICS
+#ifdef TRACE_PS2_SYNAPTICS
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
 // synaptics touchpad proportions
 #define SYN_EDGE_MOTION_WIDTH	50
 #define SYN_AREA_OFFSET			40
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_trackpoint.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_trackpoint.cpp
index c2be0aea28..3f52ae8955 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_trackpoint.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_trackpoint.cpp
@@ -15,6 +15,14 @@
 #include "ps2_trackpoint.h"
 
 
+//#define TRACE_PS2_TRACKPOINT
+#ifdef TRACE_PS2_TRACKPOINT
+#	define TRACE(x...) dprintf(x)
+#else
+#	define TRACE(x...)
+#endif
+
+
 const char* kTrackpointPath[4] = {
 	"input/mouse/ps2/ibm_trackpoint_0",
 	"input/mouse/ps2/ibm_trackpoint_1",