diff options
author | thompsa <thompsa@FreeBSD.org> | 2010-05-18 03:16:02 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2010-05-18 03:16:02 +0000 |
commit | 684fea40b494a86f147beb6d274924a54e0106a7 (patch) | |
tree | 1861a3005f7094c53836deb9a11be072a048491a /lib | |
parent | 737d9e99f4081b71db0cc22bd31f7f8b0ab36eae (diff) | |
download | FreeBSD-src-684fea40b494a86f147beb6d274924a54e0106a7.zip FreeBSD-src-684fea40b494a86f147beb6d274924a54e0106a7.tar.gz |
MFC r208023
Use fixed width integer types for parsing the binary hid data.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libusbhid/data.c | 9 | ||||
-rw-r--r-- | lib/libusbhid/usbhid.h | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c index 087989c..eb42422 100644 --- a/lib/libusbhid/data.c +++ b/lib/libusbhid/data.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include "usbhid.h" -int +int32_t hid_get_data(const void *p, const hid_item_t *h) { const unsigned char *buf; @@ -68,12 +68,15 @@ hid_get_data(const void *p, const hid_item_t *h) } void -hid_set_data(void *p, const hid_item_t *h, int data) +hid_set_data(void *p, const hid_item_t *h, int32_t data) { unsigned char *buf; unsigned int hpos; unsigned int hsize; - int i, end, offs, mask; + uint32_t mask; + int i; + int end; + int offs; buf = p; hpos = h->pos; /* bit position of data */ diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h index b8751cd..90f0f03 100644 --- a/lib/libusbhid/usbhid.h +++ b/lib/libusbhid/usbhid.h @@ -30,6 +30,7 @@ */ #include <sys/cdefs.h> +#include <sys/types.h> typedef struct report_desc *report_desc_t; @@ -105,7 +106,7 @@ int hid_parse_usage_in_page(const char *name); int hid_parse_usage_page(const char *name); /* Extracting/insertion of data, data.c: */ -int hid_get_data(const void *p, const hid_item_t *h); -void hid_set_data(void *p, const hid_item_t *h, int data); +int32_t hid_get_data(const void *p, const hid_item_t *h); +void hid_set_data(void *p, const hid_item_t *h, int32_t data); __END_DECLS |