diff options
author | osy <50960678+osy@users.noreply.github.com> | 2021-05-11 20:45:44 -0700 |
---|---|---|
committer | Nathan Hjelm <hjelmn@google.com> | 2021-05-16 15:14:29 -0600 |
commit | bd097fe80255d4df55b673f45d96d39db0d47886 (patch) | |
tree | 5688c50c19568b7a468446c5173c126838ef5ab2 | |
parent | b8b7fd61d235fbc97791dcf7f70372b192e1047d (diff) | |
download | libusb-bd097fe80255d4df55b673f45d96d39db0d47886.tar.gz |
darwin: rename darwin_reset_device
Since it calls USBDeviceReEnumerate() and not USBDeviceReset(), we name
it accordingly.
Signed-off-by: Nathan Hjelm <hjelmn@google.com>
-rw-r--r-- | libusb/os/darwin_usb.c | 15 | ||||
-rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index 699ca0e..0a3b79f 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -81,6 +81,7 @@ static pthread_t libusb_darwin_at; static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, void *buffer, size_t len); static int darwin_claim_interface(struct libusb_device_handle *dev_handle, uint8_t iface); static int darwin_release_interface(struct libusb_device_handle *dev_handle, uint8_t iface); +static int darwin_reenumerate_device(struct libusb_device_handle *dev_handle, bool capture); static int darwin_reset_device(struct libusb_device_handle *dev_handle); static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0); @@ -1673,7 +1674,7 @@ static int darwin_restore_state (struct libusb_device_handle *dev_handle, int8_t return LIBUSB_SUCCESS; } -static int darwin_reset_device(struct libusb_device_handle *dev_handle) { +static int darwin_reenumerate_device (struct libusb_device_handle *dev_handle) { struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev); unsigned long claimed_interfaces = dev_handle->claimed_interfaces; int8_t active_config = dpriv->active_config; @@ -1708,7 +1709,7 @@ static int darwin_reset_device(struct libusb_device_handle *dev_handle) { return darwin_to_libusb (kresult); } - usbi_dbg ("darwin/reset_device: waiting for re-enumeration to complete..."); + usbi_dbg ("darwin/reenumerate_device: waiting for re-enumeration to complete..."); time = 0; while (dpriv->in_reenumerate) { @@ -1722,23 +1723,23 @@ static int darwin_reset_device(struct libusb_device_handle *dev_handle) { } /* compare descriptors */ - usbi_dbg ("darwin/reset_device: checking whether descriptors changed"); + usbi_dbg ("darwin/reenumerate_device: checking whether descriptors changed"); if (memcmp (&descriptor, &dpriv->dev_descriptor, sizeof (descriptor))) { /* device descriptor changed. need to return not found. */ - usbi_dbg ("darwin/reset_device: device descriptor changed"); + usbi_dbg ("darwin/reenumerate_device: device descriptor changed"); return LIBUSB_ERROR_NOT_FOUND; } for (i = 0 ; i < descriptor.bNumConfigurations ; ++i) { (void) (*(dpriv->device))->GetConfigurationDescriptorPtr (dpriv->device, i, &cached_configuration); if (memcmp (cached_configuration, cached_configurations + i, sizeof (cached_configurations[i]))) { - usbi_dbg ("darwin/reset_device: configuration descriptor %d changed", i); + usbi_dbg ("darwin/reenumerate_device: configuration descriptor %d changed", i); return LIBUSB_ERROR_NOT_FOUND; } } - usbi_dbg ("darwin/reset_device: device reset complete. restoring state..."); + usbi_dbg ("darwin/reenumerate_device: device reset complete. restoring state..."); return darwin_restore_state (dev_handle, active_config, claimed_interfaces); } @@ -2297,7 +2298,7 @@ const struct usbi_os_backend usbi_backend = { .set_interface_altsetting = darwin_set_interface_altsetting, .clear_halt = darwin_clear_halt, - .reset_device = darwin_reset_device, + .reset_device = darwin_reenumerate_device, #if InterfaceVersion >= 550 .alloc_streams = darwin_alloc_streams, diff --git a/libusb/version_nano.h b/libusb/version_nano.h index b4a6dae..8ed8ddc 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11610 +#define LIBUSB_NANO 11611 |