summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gerecke <jason.gerecke@wacom.com>2022-01-04 11:33:43 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2022-02-22 10:41:51 +1000
commitfe50ba4c0048d58f09489ad85f11c0ae4838b5b9 (patch)
treebbac3b1d67a18229644434557d03b2e7afea3368
parentca19d531ab888e9ff80d5beb26af366061a2edd5 (diff)
downloadxf86-input-wacom-fe50ba4c0048d58f09489ad85f11c0ae4838b5b9.tar.gz
Make wcmEventCnt an unsigned int
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
-rw-r--r--src/wcmUSB.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index d9ff852..b3a6750 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -38,7 +38,7 @@ typedef struct {
Bool wcmPenTouch;
Bool wcmUseMT;
int wcmMTChannel;
- int wcmEventCnt;
+ unsigned int wcmEventCnt;
struct input_event wcmEvents[MAX_USB_EVENTS];
uint32_t wcmEventFlags; /* event types received in this frame */
int nbuttons; /* total number of buttons */
@@ -981,7 +981,7 @@ static void usbParseEvent(WacomDevicePtr priv,
/* space left? bail if not. */
if (private->wcmEventCnt >= ARRAY_SIZE(private->wcmEvents))
{
- wcmLogSafe(priv, W_ERROR, "%s: usbParse: Exceeded event queue (%d) \n",
+ wcmLogSafe(priv, W_ERROR, "%s: usbParse: Exceeded event queue (%u) \n",
priv->name, private->wcmEventCnt);
usbResetEventCounter(private);
return;
@@ -1809,7 +1809,7 @@ static Bool usbIsTabletToolInProx(int device_type, int proximity)
static void usbDispatchEvents(WacomDevicePtr priv)
{
- int i, c;
+ int c;
WacomDeviceState *ds;
struct input_event* event;
WacomCommonPtr common = priv->common;
@@ -1817,7 +1817,7 @@ static void usbDispatchEvents(WacomDevicePtr priv)
wcmUSBData* private = common->private;
WacomDeviceState dslast = common->wcmChannel[private->lastChannel].valid.state;
- DBG(6, common, "%d events received\n", private->wcmEventCnt);
+ DBG(6, common, "%u events received\n", private->wcmEventCnt);
private->wcmDeviceType = usbInitToolType(priv, wcmGetFd(priv),
private->wcmEvents,
@@ -1868,11 +1868,11 @@ static void usbDispatchEvents(WacomDevicePtr priv)
ds->serial_num = private->wcmLastToolSerial;
/* loop through all events in group */
- for (i=0; i<private->wcmEventCnt; ++i)
+ for (unsigned int i = 0; i < private->wcmEventCnt; ++i)
{
event = private->wcmEvents + i;
DBG(11, common,
- "event[%d]->type=%d code=%d value=%d\n",
+ "event[%u]->type=%d code=%d value=%d\n",
i, event->type, event->code, event->value);
/* Check for events to be ignored and skip them up front. */