diff options
Diffstat (limited to 'sys/dev/usb/hid.c')
| -rw-r--r-- | sys/dev/usb/hid.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c index b37a5d0..dba1e0d 100644 --- a/sys/dev/usb/hid.c +++ b/sys/dev/usb/hid.c @@ -44,7 +44,7 @@ #include <sys/kernel.h> #endif #include <sys/malloc.h> - + #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> @@ -189,7 +189,7 @@ hid_get_item(struct hid_data *s, struct hid_item *h) printf("BAD LENGTH %d\n", bSize); continue; } - + switch (bType) { case 0: /* Main */ switch (bTag) { @@ -204,8 +204,8 @@ hid_get_item(struct hid_data *s, struct hid_item *h) s->multi = 0; c->loc.count = 1; if (s->minset) { - for (i = c->usage_minimum; - i <= c->usage_maximum; + for (i = c->usage_minimum; + i <= c->usage_maximum; i++) { s->usages[s->nu] = i; if (s->nu < MAXUSAGE-1) @@ -217,7 +217,7 @@ hid_get_item(struct hid_data *s, struct hid_item *h) } else { *h = *c; h->next = 0; - c->loc.pos += + c->loc.pos += c->loc.size * c->loc.count; hid_clear_local(c); s->minset = 0; @@ -307,9 +307,9 @@ hid_get_item(struct hid_data *s, struct hid_item *h) case 2: /* Local */ switch (bTag) { case 0: - if (bSize == 1) + if (bSize == 1) dval = c->_usage_page | (dval&0xff); - else if (bSize == 2) + else if (bSize == 2) dval = c->_usage_page | (dval&0xffff); c->usage = dval; if (s->nu < MAXUSAGE) @@ -318,16 +318,16 @@ hid_get_item(struct hid_data *s, struct hid_item *h) break; case 1: s->minset = 1; - if (bSize == 1) + if (bSize == 1) dval = c->_usage_page | (dval&0xff); - else if (bSize == 2) + else if (bSize == 2) dval = c->_usage_page | (dval&0xffff); c->usage_minimum = dval; break; case 2: - if (bSize == 1) + if (bSize == 1) dval = c->_usage_page | (dval&0xff); - else if (bSize == 2) + else if (bSize == 2) dval = c->_usage_page | (dval&0xffff); c->usage_maximum = dval; break; @@ -421,7 +421,7 @@ hid_get_data(u_char *buf, struct hid_location *loc) return (0); data = 0; - s = hpos / 8; + s = hpos / 8; for (i = hpos; i < hpos+hsize; i += 8) data |= buf[i / 8] << ((i / 8 - s) * 8); data >>= hpos % 8; @@ -429,7 +429,7 @@ hid_get_data(u_char *buf, struct hid_location *loc) hsize = 32 - hsize; /* Sign extend */ data = ((int32_t)data << hsize) >> hsize; - DPRINTFN(10,("hid_get_data: loc %d/%d = %lu\n", + DPRINTFN(10,("hid_get_data: loc %d/%d = %lu\n", loc->pos, loc->size, (long)data)); return (data); } |
