Module Name: src
Committed By: jakllsch
Date: Sat Jan 2 20:57:10 UTC 2016
Modified Files:
src/sys/dev/usb: hid.c
Log Message:
Fix dval signdedness confusion, as was recently done in libusbhid.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/hid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/hid.c
diff -u src/sys/dev/usb/hid.c:1.38 src/sys/dev/usb/hid.c:1.39
--- src/sys/dev/usb/hid.c:1.38 Sat Jan 2 20:49:39 2016
+++ src/sys/dev/usb/hid.c Sat Jan 2 20:57:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.c,v 1.38 2016/01/02 20:49:39 jakllsch Exp $ */
+/* $NetBSD: hid.c,v 1.39 2016/01/02 20:57:10 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.38 2016/01/02 20:49:39 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.39 2016/01/02 20:57:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,17 +171,19 @@ hid_get_item(struct hid_data *s, struct
dval = 0;
break;
case 1:
- dval = /*(int8_t)*/ *data++;
+ dval = (int8_t)*data++;
break;
case 2:
dval = *data++;
dval |= *data++ << 8;
+ dval = (int16_t)dval;
break;
case 4:
dval = *data++;
dval |= *data++ << 8;
dval |= *data++ << 16;
dval |= *data++ << 24;
+ dval = (int32_t)dval;
break;
default:
printf("BAD LENGTH %d\n", bSize);
