Sync with NetBSD.

- Bump shared library version on libusbhid.
- Retire libusbhid.h; it is called usbhid.h now.
- hid_start_parse() takes a third argument.
- hid_locate() takes a fifth argument.
- hid_report_size() order of arguments changes.
- Other changes, including formatting and whitespace.

Bump __FreeBSD_version.

This change will break all third party applications that rely on previous
FreeBSD specific behavior.

1 files changed, 4 insertions, 3 deletions

diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 1485586..1e56a1b 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -47,13 +47,14 @@
 #include <err.h>
 #include <ctype.h>
 #include <errno.h>
-#include <libusbhid.h>
+#include <usbhid.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 
 int verbose = 0;
 int all = 0;
 int noname = 0;
+static int reportid;
 
 char **names;
 int nnames;
@@ -125,7 +126,7 @@ dumpitems(report_desc_t r)
 	struct hid_item h;
 	int size;
 
-	for (d = hid_start_parse(r, ~0); hid_get_item(d, &h); ) {
+	for (d = hid_start_parse(r, ~0, reportid); hid_get_item(d, &h); ) {
 		switch (h.kind) {
 		case hid_collection:
 			printf("Collection page=%s usage=%s\n",
@@ -204,7 +205,7 @@ dumpdata(int f, report_desc_t rd, int loop)
 	char namebuf[10000], *namep;
 
 	hids = 0;
-	for (d = hid_start_parse(rd, 1<<hid_input); 
+	for (d = hid_start_parse(rd, 1<<hid_input, reportid); 
 	     hid_get_item(d, &h); ) {
 		if (h.kind == hid_collection)
 			colls[++sp] = h.usage;