From Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>:
Adrien Destugues has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/5386 ;)
Change subject: ps2: improve tracing
......................................................................
ps2: improve tracing
Change-Id: I3991e1974ac4af2ba00d692284bfcf00e5b4cc84
---
M src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
M src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
M src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
M src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp
4 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/86/5386/1
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 7c9f93c..8143147 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
@@ -500,7 +500,7 @@
// without a complete shutdown.
status_t status = ps2_reset_mouse(cookie->dev);
if (status != B_OK) {
- INFO("ps2: reset failed\n");
+ INFO("ps2_alps: reset failed\n");
return B_ERROR;
}
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 4d01858..5f2b7ba 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
@@ -72,7 +72,7 @@
{
status_t status = ps2_reset_mouse(dev);
if (status != B_OK) {
- INFO("ps2: reset failed\n");
+ INFO("ps2_dev: reset failed: %s\n", strerror(status));
return B_ERROR;
}
@@ -376,7 +376,7 @@
int out_count, uint8* in, int in_count, bigtime_t timeout)
{
status_t res;
-#ifdef TRACE_PS2
+#ifdef TRACE_PS2_DEV
bigtime_t start;
#endif
int32 sem_count;
@@ -436,7 +436,7 @@
}
release_sem(gControllerSem);
-#ifdef TRACE_PS2
+#ifdef TRACE_PS2_DEV
start = system_time();
#endif
res = acquire_sem_etc(dev->result_sem, 1, B_RELATIVE_TIMEOUT,
timeout);
@@ -444,7 +444,7 @@
if (res != B_OK)
atomic_and(&dev->flags, ~PS2_FLAG_CMD);
-#ifdef TRACE_PS2
+#ifdef TRACE_PS2_DEV
TRACE("ps2: ps2_dev_command wait for ack res 0x%08" B_PRIx32 ",
"
"wait-time %" B_PRId64 "\n", res, system_time() -
start);
#endif
@@ -466,7 +466,7 @@
if (in_count == 0) {
atomic_and(&dev->flags, ~PS2_FLAG_CMD);
} else {
-#ifdef TRACE_PS2
+#ifdef TRACE_PS2_DEV
start = system_time();
#endif
res = acquire_sem_etc(dev->result_sem, 1,
B_RELATIVE_TIMEOUT,
@@ -482,7 +482,7 @@
res = B_IO_ERROR;
}
-#ifdef TRACE_PS2
+#ifdef TRACE_PS2_DEV
TRACE("ps2: ps2_dev_command wait for input res 0x%08"
B_PRIx32 ", "
"wait-time %" B_PRId64 "\n", res, system_time()
- start);
for (i = 0; i < in_count; i++)
@@ -491,7 +491,7 @@
}
}
- TRACE("ps2: ps2_dev_command result 0x%08" B_PRIx32 "\n", res);
+ TRACE("ps2: ps2_dev_command result: %s\n", strerror(res));
return res;
}
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 39a748f..1b6b62b 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
@@ -683,7 +683,7 @@
// without a complete shutdown.
status_t status = ps2_reset_mouse(cookie->dev);
if (status != B_OK) {
- INFO("ps2: reset failed\n");
+ INFO("ps2_elantech: reset failed\n");
return B_ERROR;
}
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 c821b4f..5f4d785 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp
@@ -567,7 +567,7 @@
// without a complete shutdown.
status = ps2_reset_mouse(cookie->dev);
if (status != B_OK) {
- INFO("ps2: reset failed\n");
+ INFO("ps2_synaptics: reset failed\n");
return B_ERROR;
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/5386
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I3991e1974ac4af2ba00d692284bfcf00e5b4cc84
Gerrit-Change-Number: 5386
Gerrit-PatchSet: 1
Gerrit-Owner: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Gerrit-MessageType: newchange