diff options
| -rw-r--r-- | lib/libusb/libusb.3 | 2 | ||||
| -rw-r--r-- | lib/libusb/libusb01.c | 70 | ||||
| -rw-r--r-- | lib/libusb/libusb10.c | 2 | ||||
| -rw-r--r-- | lib/libusb/libusb10_desc.c | 9 | ||||
| -rw-r--r-- | lib/libusb/libusb20.c | 2 | ||||
| -rw-r--r-- | lib/libusb/usb.h | 2 |
6 files changed, 87 insertions, 0 deletions
diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3 index e7e31157a419..33d807dbf85e 100644 --- a/lib/libusb/libusb.3 +++ b/lib/libusb/libusb.3 @@ -542,6 +542,8 @@ The library is also compliant with LibUSB version 0.1.12. .Fn usb_device .Fn usb_get_busses .Fn usb_check_connected +.Fn usb_get_driver_np +.Fn usb_detach_kernel_driver_np . .Sh SEE ALSO .Xr libusb20 3 , diff --git a/lib/libusb/libusb01.c b/lib/libusb/libusb01.c index 4124ef6fbcd5..17edb0e7df93 100644 --- a/lib/libusb/libusb01.c +++ b/lib/libusb/libusb01.c @@ -203,6 +203,12 @@ usb_get_string(usb_dev_handle * dev, int strindex, { int err; + if (dev == NULL) + return (-1); + + if (buflen > 65535) + buflen = 65535; + err = libusb20_dev_req_string_sync((void *)dev, strindex, langid, buf, buflen); @@ -218,6 +224,12 @@ usb_get_string_simple(usb_dev_handle * dev, int strindex, { int err; + if (dev == NULL) + return (-1); + + if (buflen > 65535) + buflen = 65535; + err = libusb20_dev_req_string_simple_sync((void *)dev, strindex, buf, buflen); @@ -233,6 +245,12 @@ usb_get_descriptor_by_endpoint(usb_dev_handle * udev, int ep, uint8_t type, { memset(buf, 0, size); + if (udev == NULL) + return (-1); + + if (size > 65535) + size = 65535; + return (usb_control_msg(udev, ep | USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (type << 8) + ep_index, 0, buf, size, 1000)); @@ -244,6 +262,12 @@ usb_get_descriptor(usb_dev_handle * udev, uint8_t type, uint8_t desc_index, { memset(buf, 0, size); + if (udev == NULL) + return (-1); + + if (size > 65535) + size = 65535; + return (usb_control_msg(udev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (type << 8) + desc_index, 0, buf, size, 1000)); } @@ -943,3 +967,49 @@ usb_get_busses(void) { return (usb_busses); } + +int +usb_get_driver_np(usb_dev_handle * dev, int interface, char *name, int namelen) +{ + struct libusb20_device *pdev; + char *ptr; + int err; + + pdev = (void *)dev; + + if (pdev == NULL) + return (-1); + if (namelen < 1) + return (-1); + if (namelen > 255) + namelen = 255; + + err = libusb20_dev_get_iface_desc(pdev, interface, name, namelen); + if (err != 0) + return (-1); + + /* we only want the driver name */ + ptr = strstr(name, ":"); + if (ptr != NULL) + *ptr = 0; + + return (0); +} + +int +usb_detach_kernel_driver_np(usb_dev_handle * dev, int interface) +{ + struct libusb20_device *pdev; + int err; + + pdev = (void *)dev; + + if (pdev == NULL) + return (-1); + + err = libusb20_dev_detach_kernel_driver(pdev, interface); + if (err != 0) + return (-1); + + return (0); +} diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 737e6109aeee..3ecba58ebb37 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -719,6 +719,8 @@ libusb_get_driver(struct libusb20_device *pdev, int interface, return (LIBUSB_ERROR_INVALID_PARAM); if (namelen < 1) return (LIBUSB_ERROR_INVALID_PARAM); + if (namelen > 255) + namelen = 255; err = libusb20_dev_get_iface_desc( pdev, interface, name, namelen); diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c index 58237236bb5f..3448679de2f8 100644 --- a/lib/libusb/libusb10_desc.c +++ b/lib/libusb/libusb10_desc.c @@ -300,6 +300,9 @@ libusb_get_string_descriptor_ascii(libusb_device_handle *pdev, if (pdev == NULL || data == NULL || length < 1) return (LIBUSB20_ERROR_INVALID_PARAM); + if (length > 65535) + length = 65535; + /* put some default data into the destination buffer */ data[0] = 0; @@ -314,6 +317,12 @@ int libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length) { + if (devh == NULL || data == NULL || length < 1) + return (LIBUSB20_ERROR_INVALID_PARAM); + + if (length > 65535) + length = 65535; + return (libusb_control_transfer(devh, LIBUSB_ENDPOINT_IN, LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data, length, 1000)); diff --git a/lib/libusb/libusb20.c b/lib/libusb/libusb20.c index 716f5403529d..b35e2bf46eb1 100644 --- a/lib/libusb/libusb20.c +++ b/lib/libusb/libusb20.c @@ -1081,6 +1081,8 @@ libusb20_dev_get_iface_desc(struct libusb20_device *pdev, if ((buf == NULL) || (len == 0)) return (LIBUSB20_ERROR_INVALID_PARAM); + buf[0] = 0; /* set default string value */ + return (pdev->beMethods->dev_get_iface_desc( pdev, iface_index, buf, len)); } diff --git a/lib/libusb/usb.h b/lib/libusb/usb.h index 8ee68f29acb8..dc3959e17f81 100644 --- a/lib/libusb/usb.h +++ b/lib/libusb/usb.h @@ -299,6 +299,8 @@ int usb_find_busses(void); int usb_find_devices(void); struct usb_device *usb_device(usb_dev_handle * dev); struct usb_bus *usb_get_busses(void); +int usb_get_driver_np(usb_dev_handle * dev, int interface, char *name, int namelen); +int usb_detach_kernel_driver_np(usb_dev_handle * dev, int interface); #if 0 { /* style */ |