diff options
author | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-03-16 01:15:29 -0700 |
---|---|---|
committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-03-16 01:15:29 -0700 |
commit | e32f1fd7bff3a483ce25717342a50af24b73a0c1 (patch) | |
tree | 6dc8171a1d5fae1d1a5bb584b098ea051c06a952 /libusb/os | |
parent | 89d574b87976ef58b6c94c26864dcc5330b0c067 (diff) | |
download | libusb-e32f1fd7bff3a483ce25717342a50af24b73a0c1.tar.gz |
core: Make the 'reset_device' function of the backend optional
The majority of backends do not have support for resetting a device, so
simplify them all by making the function optional and having the core
return the appropriate error when the function is not implemented.
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'libusb/os')
-rw-r--r-- | libusb/os/haiku_usb_raw.cpp | 8 | ||||
-rw-r--r-- | libusb/os/netbsd_usb.c | 10 | ||||
-rw-r--r-- | libusb/os/null_usb.c | 7 | ||||
-rw-r--r-- | libusb/os/openbsd_usb.c | 10 | ||||
-rw-r--r-- | libusb/os/sunos_usb.c | 10 |
5 files changed, 0 insertions, 45 deletions
diff --git a/libusb/os/haiku_usb_raw.cpp b/libusb/os/haiku_usb_raw.cpp index 63efc17..7c0c4db 100644 --- a/libusb/os/haiku_usb_raw.cpp +++ b/libusb/os/haiku_usb_raw.cpp @@ -136,13 +136,6 @@ haiku_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint } static int -haiku_reset_device(struct libusb_device_handle *dev_handle) -{ - /* TODO */ - return LIBUSB_ERROR_NOT_SUPPORTED; -} - -static int haiku_release_interface(struct libusb_device_handle *dev_handle, int interface_number) { USBDeviceHandle *handle = *((USBDeviceHandle **)usbi_get_device_handle_priv(dev_handle)); @@ -212,7 +205,6 @@ const struct usbi_os_backend usbi_backend = { .set_interface_altsetting = haiku_set_altsetting, .clear_halt = haiku_clear_halt, - .reset_device = haiku_reset_device, .submit_transfer = haiku_submit_transfer, .cancel_transfer = haiku_cancel_transfer, diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c index 66ff887..41f003f 100644 --- a/libusb/os/netbsd_usb.c +++ b/libusb/os/netbsd_usb.c @@ -68,7 +68,6 @@ static int netbsd_release_interface(struct libusb_device_handle *, int); static int netbsd_set_interface_altsetting(struct libusb_device_handle *, int, int); static int netbsd_clear_halt(struct libusb_device_handle *, unsigned char); -static int netbsd_reset_device(struct libusb_device_handle *); static void netbsd_destroy_device(struct libusb_device *); static int netbsd_submit_transfer(struct usbi_transfer *); @@ -103,7 +102,6 @@ const struct usbi_os_backend usbi_backend = { .set_interface_altsetting = netbsd_set_interface_altsetting, .clear_halt = netbsd_clear_halt, - .reset_device = netbsd_reset_device, .destroy_device = netbsd_destroy_device, @@ -387,14 +385,6 @@ netbsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) return (LIBUSB_SUCCESS); } -int -netbsd_reset_device(struct libusb_device_handle *handle) -{ - usbi_dbg(" "); - - return (LIBUSB_ERROR_NOT_SUPPORTED); -} - void netbsd_destroy_device(struct libusb_device *dev) { diff --git a/libusb/os/null_usb.c b/libusb/os/null_usb.c index 03c33e1..7893b0c 100644 --- a/libusb/os/null_usb.c +++ b/libusb/os/null_usb.c @@ -89,12 +89,6 @@ null_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) } static int -null_reset_device(struct libusb_device_handle *handle) -{ - return LIBUSB_ERROR_NOT_SUPPORTED; -} - -static int null_submit_transfer(struct usbi_transfer *itransfer) { return LIBUSB_ERROR_NOT_SUPPORTED; @@ -120,7 +114,6 @@ const struct usbi_os_backend usbi_backend = { .release_interface = null_release_interface, .set_interface_altsetting = null_set_interface_altsetting, .clear_halt = null_clear_halt, - .reset_device = null_reset_device, .submit_transfer = null_submit_transfer, .cancel_transfer = null_cancel_transfer, }; diff --git a/libusb/os/openbsd_usb.c b/libusb/os/openbsd_usb.c index 430023a..1080026 100644 --- a/libusb/os/openbsd_usb.c +++ b/libusb/os/openbsd_usb.c @@ -68,7 +68,6 @@ static int obsd_release_interface(struct libusb_device_handle *, int); static int obsd_set_interface_altsetting(struct libusb_device_handle *, int, int); static int obsd_clear_halt(struct libusb_device_handle *, unsigned char); -static int obsd_reset_device(struct libusb_device_handle *); static void obsd_destroy_device(struct libusb_device *); static int obsd_submit_transfer(struct usbi_transfer *); @@ -105,7 +104,6 @@ const struct usbi_os_backend usbi_backend = { .set_interface_altsetting = obsd_set_interface_altsetting, .clear_halt = obsd_clear_halt, - .reset_device = obsd_reset_device, .destroy_device = obsd_destroy_device, .submit_transfer = obsd_submit_transfer, @@ -425,14 +423,6 @@ obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) return (LIBUSB_SUCCESS); } -int -obsd_reset_device(struct libusb_device_handle *handle) -{ - usbi_dbg(" "); - - return (LIBUSB_ERROR_NOT_SUPPORTED); -} - void obsd_destroy_device(struct libusb_device *dev) { diff --git a/libusb/os/sunos_usb.c b/libusb/os/sunos_usb.c index cd32f8b..bc66859 100644 --- a/libusb/os/sunos_usb.c +++ b/libusb/os/sunos_usb.c @@ -75,7 +75,6 @@ static int sunos_release_interface(struct libusb_device_handle *, int); static int sunos_set_interface_altsetting(struct libusb_device_handle *, int, int); static int sunos_clear_halt(struct libusb_device_handle *, uint8_t); -static int sunos_reset_device(struct libusb_device_handle *); static void sunos_destroy_device(struct libusb_device *); static int sunos_submit_transfer(struct usbi_transfer *); static int sunos_cancel_transfer(struct usbi_transfer *); @@ -1385,14 +1384,6 @@ sunos_clear_halt(struct libusb_device_handle *handle, uint8_t endpoint) return (ret); } -int -sunos_reset_device(struct libusb_device_handle *handle) -{ - usbi_dbg(" "); - - return (LIBUSB_ERROR_NOT_SUPPORTED); -} - void sunos_destroy_device(struct libusb_device *dev) { @@ -1632,7 +1623,6 @@ const struct usbi_os_backend usbi_backend = { .release_interface = sunos_release_interface, .set_interface_altsetting = sunos_set_interface_altsetting, .clear_halt = sunos_clear_halt, - .reset_device = sunos_reset_device, /* TODO */ .kernel_driver_active = sunos_kernel_driver_active, .detach_kernel_driver = sunos_detach_kernel_driver, .attach_kernel_driver = sunos_attach_kernel_driver, |