diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/usbhidaction/usbhidaction.c | 7 | ||||
| -rw-r--r-- | usr.bin/usbhidctl/usbhid.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index e0d459d..a3aa3c5 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -46,9 +46,7 @@ #include <limits.h> #include <unistd.h> #include <sys/types.h> -#include <sys/ioctl.h> -#include <dev/usb/usb.h> -#include <dev/usb/usbhid.h> +#include <dev/usb2/include/usb2_hid.h> #include <usbhid.h> #include <syslog.h> #include <signal.h> @@ -155,8 +153,7 @@ main(int argc, char **argv) fd = open(dev, O_RDWR); if (fd < 0) err(1, "%s", dev); - if (ioctl(fd, USB_GET_REPORT_ID, &reportid) < 0) - reportid = -1; + reportid = hid_get_report_id(fd); repd = hid_get_report_desc(fd); if (repd == NULL) err(1, "hid_get_report_desc() failed"); diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c index ff7c544..917666e 100644 --- a/usr.bin/usbhidctl/usbhid.c +++ b/usr.bin/usbhidctl/usbhid.c @@ -42,14 +42,12 @@ #include <string.h> #include <sys/types.h> #include <fcntl.h> -#include <sys/ioctl.h> #include <unistd.h> #include <err.h> #include <ctype.h> #include <errno.h> #include <usbhid.h> -#include <dev/usb/usb.h> -#include <dev/usb/usbhid.h> +#include <dev/usb2/include/usb2_hid.h> int verbose = 0; int all = 0; @@ -207,7 +205,6 @@ dumpdata(int f, report_desc_t rd, int loop) struct hid_item h, *hids, *n; int r, dlen; u_char *dbuf; - static int one = 1; u_int32_t colls[100]; int sp = 0; char namebuf[10000], *namep; @@ -231,7 +228,7 @@ dumpdata(int f, report_desc_t rd, int loop) dlen = hid_report_size(rd, hid_input, 0); dbuf = malloc(dlen); if (!loop) - if (ioctl(f, USB_SET_IMMED, &one) < 0) { + if (hid_set_immed(f, 1) < 0) { if (errno == EOPNOTSUPP) warnx("device does not support immediate mode, only changes reported."); else |
