diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-02-23 18:36:54 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-02-23 18:36:54 +0000 |
| commit | 67f51fe4b6588da6a22256d85370d621edce59d2 (patch) | |
| tree | b2372a733b5fd6eaae1b2ddf567b80210c8317ff /lib/libusbhid | |
| parent | 6b0018e885dd384f1bb0b0572d672fca70457e1d (diff) | |
| download | FreeBSD-src-67f51fe4b6588da6a22256d85370d621edce59d2.zip FreeBSD-src-67f51fe4b6588da6a22256d85370d621edce59d2.tar.gz | |
Build fixups for the new USB stack.
Diffstat (limited to 'lib/libusbhid')
| -rw-r--r-- | lib/libusbhid/descr.c | 8 | ||||
| -rw-r--r-- | lib/libusbhid/descr_compat.c | 2 | ||||
| -rw-r--r-- | lib/libusbhid/usbvar.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c index cc1737b..0ae383f 100644 --- a/lib/libusbhid/descr.c +++ b/lib/libusbhid/descr.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/ioctl.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb_ioctl.h> #include "usbhid.h" #include "usbvar.h" @@ -49,8 +49,10 @@ hid_set_immed(int fd, int enable) { int ret; ret = ioctl(fd, USB_SET_IMMED, &enable); +#ifdef HID_COMPAT7 if (ret < 0) ret = hid_set_immed_compat7(fd, enable); +#endif return (ret); } @@ -61,9 +63,11 @@ hid_get_report_id(int fd) int ret; ret = ioctl(fd, USB_GET_REPORT_ID, &temp); +#ifdef HID_COMPAT7 if (ret < 0) ret = hid_get_report_id_compat7(fd); else +#endif ret = temp; return (ret); @@ -81,11 +85,13 @@ hid_get_report_desc(int fd) /* get actual length first */ ugd.ugd_data = NULL; ugd.ugd_maxlen = 65535; +#ifdef HID_COMPAT7 if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) { /* could not read descriptor */ /* try FreeBSD 7 compat code */ return (hid_get_report_desc_compat7(fd)); } +#endif /* * NOTE: The kernel will return a failure if diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c index 3cbcdbf..a38d8d7 100644 --- a/lib/libusbhid/descr_compat.c +++ b/lib/libusbhid/descr_compat.c @@ -28,6 +28,7 @@ * This file contains fallback-compatibility code for the old FreeBSD * USB stack. */ +#ifdef HID_COMPAT7 #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -75,3 +76,4 @@ hid_get_report_desc_compat7(int fd) return (hid_use_report_desc(rep.ucrd_data, (unsigned int)rep.ucrd_size)); } +#endif /* HID_COMPAT7 */ diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h index b8fbf37..d437005 100644 --- a/lib/libusbhid/usbvar.h +++ b/lib/libusbhid/usbvar.h @@ -36,6 +36,8 @@ struct report_desc { /* internal backwards compatibility functions */ +#ifdef HID_COMPAT7 int hid_set_immed_compat7(int fd, int enable); int hid_get_report_id_compat7(int fd); report_desc_t hid_get_report_desc_compat7(int fd); +#endif |
