r = submit_img_transfer();
if (r < 0) {
- libusb_cancel_transfer_sync(devh, img_transfer);
+ libusb_cancel_transfer_sync(img_transfer);
return r;
}
printf("shutting down...\n");
- r = libusb_cancel_transfer_sync(devh, irq_transfer);
+ r = libusb_cancel_transfer_sync(irq_transfer);
if (r < 0)
goto out_deinit;
- r = libusb_cancel_transfer_sync(devh, img_transfer);
+ r = libusb_cancel_transfer_sync(img_transfer);
if (r < 0)
goto out_deinit;
return submit_transfer(itransfer);
}
-API_EXPORTED int libusb_cancel_transfer(struct libusb_device_handle *devh,
- struct libusb_transfer *transfer)
+API_EXPORTED int libusb_cancel_transfer(struct libusb_transfer *transfer)
{
struct usbi_transfer *itransfer = TRANSFER_TO_PRIV(transfer);
int r;
usbi_dbg("");
- r = ioctl(devh->fd, IOCTL_USB_DISCARDURB, &itransfer->urb);
+ r = ioctl(transfer->dev_handle->fd, IOCTL_USB_DISCARDURB, &itransfer->urb);
if (r < 0)
usbi_err("cancel transfer failed error %d", r);
return r;
}
-API_EXPORTED int libusb_cancel_transfer_sync(struct libusb_device_handle *devh,
- struct libusb_transfer *transfer)
+API_EXPORTED int libusb_cancel_transfer_sync(struct libusb_transfer *transfer)
{
struct usbi_transfer *itransfer = TRANSFER_TO_PRIV(transfer);
int r;
usbi_dbg("");
- r = ioctl(devh->fd, IOCTL_USB_DISCARDURB, &itransfer->urb);
+ r = ioctl(transfer->dev_handle->fd, IOCTL_USB_DISCARDURB, &itransfer->urb);
if (r < 0) {
usbi_err("cancel transfer failed error %d", r);
return r;
transfer->callback(transfer);
}
-static void handle_transfer_cancellation(struct libusb_device_handle *devh,
- struct usbi_transfer *transfer)
+static void handle_transfer_cancellation(struct usbi_transfer *transfer)
{
/* if the URB is being cancelled synchronously, raise cancellation
* completion event by unsetting flag, and ensure that user callback does
list_del(&itransfer->list);
if (urb->status == -2) {
- handle_transfer_cancellation(devh, itransfer);
+ handle_transfer_cancellation(itransfer);
return 0;
}
int r;
itransfer->flags |= USBI_TRANSFER_TIMED_OUT;
- r = libusb_cancel_transfer(transfer->dev_handle, transfer);
+ r = libusb_cancel_transfer(transfer);
if (r < 0)
usbi_warn("async cancel failed %d errno=%d", r, errno);
}
struct libusb_transfer *libusb_alloc_transfer(void);
int libusb_submit_transfer(struct libusb_transfer *transfer);
-int libusb_cancel_transfer(libusb_device_handle *devh,
- struct libusb_transfer *transfer);
-int libusb_cancel_transfer_sync(libusb_device_handle *devh,
- struct libusb_transfer *transfer);
+int libusb_cancel_transfer(struct libusb_transfer *transfer);
+int libusb_cancel_transfer_sync(struct libusb_transfer *transfer);
void libusb_free_transfer(struct libusb_transfer *transfer);
static inline void libusb_fill_control_transfer(
while (!completed) {
r = libusb_poll();
if (r < 0) {
- libusb_cancel_transfer_sync(dev_handle, transfer);
+ libusb_cancel_transfer_sync(transfer);
libusb_free_transfer(transfer);
return r;
}
while (!completed) {
r = libusb_poll();
if (r < 0) {
- libusb_cancel_transfer_sync(dev_handle, transfer);
+ libusb_cancel_transfer_sync(transfer);
libusb_free_transfer(transfer);
return r;
}