diff options
author | Chris Dickens <christopher.a.dickens@gmail.com> | 2018-01-05 15:35:26 -0800 |
---|---|---|
committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2018-01-06 21:18:13 -0800 |
commit | 6239788f9bd1f4d9de2747dd89e2c13401f83874 (patch) | |
tree | 813c36908c1c55060893495bfea2ab81d569a292 | |
parent | 6cffee50867a7b412f5bcd370305fa5302adec43 (diff) | |
download | libusb-6239788f9bd1f4d9de2747dd89e2c13401f83874.tar.gz |
Windows: UsbDk: Remove unnecessary empty functions
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
-rw-r--r-- | libusb/os/windows_usbdk.c | 38 | ||||
-rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 6 insertions, 34 deletions
diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c index 872416e..c5d1efb 100644 --- a/libusb/os/windows_usbdk.c +++ b/libusb/os/windows_usbdk.c @@ -503,27 +503,6 @@ static int usbdk_reset_device(struct libusb_device_handle *dev_handle) return LIBUSB_SUCCESS; } -static int usbdk_kernel_driver_active(struct libusb_device_handle *dev_handle, int iface) -{ - UNUSED(dev_handle); - UNUSED(iface); - return LIBUSB_ERROR_NOT_SUPPORTED; -} - -static int usbdk_attach_kernel_driver(struct libusb_device_handle *dev_handle, int iface) -{ - UNUSED(dev_handle); - UNUSED(iface); - return LIBUSB_ERROR_NOT_SUPPORTED; -} - -static int usbdk_detach_kernel_driver(struct libusb_device_handle *dev_handle, int iface) -{ - UNUSED(dev_handle); - UNUSED(iface); - return LIBUSB_ERROR_NOT_SUPPORTED; -} - static void usbdk_destroy_device(struct libusb_device *dev) { struct usbdk_device_priv* p = _usbdk_device_priv(dev); @@ -831,11 +810,6 @@ void windows_get_overlapped_result(struct usbi_transfer *transfer, struct winfd } } -static int usbdk_clock_gettime(int clk_id, struct timespec *tp) -{ - return windows_clock_gettime(clk_id, tp); -} - const struct usbi_os_backend usbi_backend = { "Windows", USBI_CAP_HAS_HID_ACCESS, @@ -868,9 +842,9 @@ const struct usbi_os_backend usbi_backend = { NULL, // dev_mem_alloc() NULL, // dev_mem_free() - usbdk_kernel_driver_active, - usbdk_detach_kernel_driver, - usbdk_attach_kernel_driver, + NULL, // kernel_driver_active() + NULL, // detach_kernel_driver() + NULL, // attach_kernel_driver() usbdk_destroy_device, @@ -881,10 +855,8 @@ const struct usbi_os_backend usbi_backend = { windows_handle_events, NULL, - usbdk_clock_gettime, -#if defined(USBI_TIMERFD_AVAILABLE) - NULL, -#endif + windows_clock_gettime, + 0, sizeof(struct usbdk_device_priv), 0, diff --git a/libusb/version_nano.h b/libusb/version_nano.h index e82799c..25ceaf4 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11268 +#define LIBUSB_NANO 11269 |