Browse Source

Add wrappers for usb_read_cancellable and usb_read_timeout_cancellable

nfactor-troky
Con Kolivas 11 years ago
parent
commit
c96f096577
  1. 2
      usbutils.c
  2. 6
      usbutils.h

2
usbutils.c

@ -2314,7 +2314,7 @@ static int usb_submit_transfer(struct usb_transfer *ut, struct libusb_transfer * @@ -2314,7 +2314,7 @@ static int usb_submit_transfer(struct usb_transfer *ut, struct libusb_transfer *
INIT_LIST_HEAD(&ut->ct.list);
list_add(&ct_list, &ut->ct.list);
} else
ut->cancellable = false;;
ut->cancellable = false;
cg_wunlock(&cgusb_fd_lock);
return err;

6
usbutils.h

@ -394,6 +394,9 @@ void *usb_resource_thread(void *userdata); @@ -394,6 +394,9 @@ void *usb_resource_thread(void *userdata);
#define usb_read(cgpu, buf, bufsiz, read, cmd) \
_usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false, false)
#define usb_read_cancellable(cgpu, buf, bufsiz, read, cmd) \
_usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false, true)
#define usb_read_ii(cgpu, intinfo, buf, bufsiz, read, cmd) \
_usb_read(cgpu, intinfo, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false, false)
@ -427,6 +430,9 @@ void *usb_resource_thread(void *userdata); @@ -427,6 +430,9 @@ void *usb_resource_thread(void *userdata);
#define usb_read_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
_usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, false, false)
#define usb_read_timeout_cancellable(cgpu, buf, bufsiz, read, timeout, cmd) \
_usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, false, true)
#define usb_read_ii_timeout(cgpu, intinfo, buf, bufsiz, read, timeout, cmd) \
_usb_read(cgpu, intinfo, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, false, false)

Loading…
Cancel
Save