diff options
author | mdodd <mdodd@FreeBSD.org> | 2003-04-09 01:52:49 +0000 |
---|---|---|
committer | mdodd <mdodd@FreeBSD.org> | 2003-04-09 01:52:49 +0000 |
commit | 339cdd9fae72c60095061f96c9d8ad19e8267275 (patch) | |
tree | 4973be599e3f1175e30998a134f2b847577c193f /usr.bin/usbhidctl | |
parent | 641a7abeaeff651137abc582c6199146cfbd0aa9 (diff) | |
download | FreeBSD-src-339cdd9fae72c60095061f96c9d8ad19e8267275.zip FreeBSD-src-339cdd9fae72c60095061f96c9d8ad19e8267275.tar.gz |
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.
Diffstat (limited to 'usr.bin/usbhidctl')
-rw-r--r-- | usr.bin/usbhidctl/usbhid.c | 7 |
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; |