MFp4 //depot/projects/usb; 157814, 157863, 157868

- The software computed HID size is not always correct, because the algoritm
  does not handle unsorted HID descriptors.
- Change the way we obtain the report ID.
- Use the X/Y/Z+button locations instead for report ID source for ums.
- Add more range checks.
- Remove Microsoft Mouse quirks. If the positions are moduloed the report
  length multiplied by 8, the values seem correct.
- Some minor style changes.

Submitted by:	Hans Petter Selasky

1 files changed, 4 insertions, 2 deletions

diff --git a/sys/dev/usb/usb_hid.h b/sys/dev/usb/usb_hid.h
index 3fb7368..7ba858d 100644
--- a/sys/dev/usb/usb_hid.h
+++ b/sys/dev/usb/usb_hid.h
@@ -79,9 +79,11 @@ struct hid_item {
 struct hid_data *hid_start_parse(const void *d, int len, int kindset);
 void	hid_end_parse(struct hid_data *s);
 int	hid_get_item(struct hid_data *s, struct hid_item *h);
-int	hid_report_size(const void *buf, int len, enum hid_kind k, uint8_t *id);
+int	hid_report_size(const void *buf, int len, enum hid_kind k,
+	    uint8_t *id);
 int	hid_locate(const void *desc, int size, uint32_t usage,
-	    enum hid_kind kind, struct hid_location *loc, uint32_t *flags);
+	    enum hid_kind kind, struct hid_location *loc,
+	    uint32_t *flags, uint8_t *id);
 uint32_t hid_get_data(const uint8_t *buf, uint32_t len,
 	    struct hid_location *loc);
 int	hid_is_collection(const void *desc, int size, uint32_t usage);