[PATCH 1/4] winebus.sys: Use +hid debug channel.
Rémi Bernon
rbernon at codeweavers.com
Tue Nov 9 02:51:08 CST 2021
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
This may be a bit verbose but then all HID backend code will be on the
same "+hid" debug channel, and frontend APIs on "+xinput" / "+dinput"
respectively, simplifying the capture of relevant logs.
dlls/winebus.sys/bus_iohid.c | 2 +-
dlls/winebus.sys/bus_sdl.c | 2 +-
dlls/winebus.sys/bus_udev.c | 2 +-
dlls/winebus.sys/hid.c | 2 +-
dlls/winebus.sys/main.c | 12 ++++++------
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c
index eef882b52e8..735fd8c54cc 100644
--- a/dlls/winebus.sys/bus_iohid.c
+++ b/dlls/winebus.sys/bus_iohid.c
@@ -97,7 +97,7 @@
#include "unix_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
+WINE_DEFAULT_DEBUG_CHANNEL(hid);
#ifdef HAVE_IOHIDMANAGERCREATE
static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER;
diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index c01648ce67e..49afcbaf67c 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -55,7 +55,7 @@
#include "unix_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
+WINE_DEFAULT_DEBUG_CHANNEL(hid);
#ifdef SONAME_LIBSDL2
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index 1591f00eedf..dad5344a54c 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -92,7 +92,7 @@
#include "unix_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
+WINE_DEFAULT_DEBUG_CHANNEL(hid);
#ifdef HAVE_UDEV
diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c
index a0f07f66392..893bf1cd7f6 100644
--- a/dlls/winebus.sys/hid.c
+++ b/dlls/winebus.sys/hid.c
@@ -39,7 +39,7 @@
#include "unix_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
+WINE_DEFAULT_DEBUG_CHANNEL(hid);
static BOOL hid_report_descriptor_append(struct hid_report_descriptor *desc, const BYTE *buffer, SIZE_T size)
{
diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index 169b64a2c83..06925395ea8 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -40,7 +40,7 @@
#include "unixlib.h"
-WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
+WINE_DEFAULT_DEBUG_CHANNEL(hid);
static DRIVER_OBJECT *driver_obj;
@@ -413,7 +413,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp)
irp->IoStatus.Information = report->length;
irp->IoStatus.Status = STATUS_SUCCESS;
- if (TRACE_ON(plugplay))
+ if (TRACE_ON(hid))
{
TRACE("read input report length %u:\n", report->length);
for (i = 0; i < report->length;)
@@ -1042,7 +1042,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen);
irp->IoStatus.Information = packet->reportBufferLen;
irp->IoStatus.Status = STATUS_SUCCESS;
- if (TRACE_ON(plugplay))
+ if (TRACE_ON(hid))
{
TRACE("read input report id %u length %u:\n", packet->reportId, packet->reportBufferLen);
for (i = 0; i < packet->reportBufferLen;)
@@ -1072,7 +1072,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
case IOCTL_HID_WRITE_REPORT:
{
HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer;
- if (TRACE_ON(plugplay))
+ if (TRACE_ON(hid))
{
TRACE("write output report id %u length %u:\n", packet->reportId, packet->reportBufferLen);
for (i = 0; i < packet->reportBufferLen;)
@@ -1091,7 +1091,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
{
HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer;
unix_device_get_feature_report(device, packet, &irp->IoStatus);
- if (!irp->IoStatus.Status && TRACE_ON(plugplay))
+ if (!irp->IoStatus.Status && TRACE_ON(hid))
{
TRACE("read feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen);
for (i = 0; i < packet->reportBufferLen;)
@@ -1108,7 +1108,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
case IOCTL_HID_SET_FEATURE:
{
HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer;
- if (TRACE_ON(plugplay))
+ if (TRACE_ON(hid))
{
TRACE("write feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen);
for (i = 0; i < packet->reportBufferLen;)
--
2.33.1
More information about the wine-devel
mailing list