Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the override that prevents Sync Bulk Transfers from working in As... #579

Merged
merged 2 commits into from
Dec 21, 2014
Merged

Remove the override that prevents Sync Bulk Transfers from working in As... #579

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceb2ed8
Remove the override that prevents Sync Bulk Transfers from working in…
nomis52 Dec 21, 2014
33d92d2
Log syncronous calls when using the asyncronous libusb adaptor.
nomis52 Dec 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions plugins/usbdmx/LibUsbAdaptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,19 +351,22 @@ int AsyncronousLibUsbAdaptor::ControlTransfer(
OLA_UNUSED unsigned char *data,
OLA_UNUSED uint16_t wLength,
OLA_UNUSED unsigned int timeout) {
OLA_WARN << "libusb_control_transfer in an AsyncronousLibUsbAdaptor";
return LIBUSB_ERROR_NOT_SUPPORTED;
OLA_DEBUG << "libusb_control_transfer in an AsyncronousLibUsbAdaptor";
return BaseLibUsbAdaptor::ControlTransfer(dev_handle, bmRequestType,
bRequest, wValue, wIndex, data,
wLength, timeout);
}

int AsyncronousLibUsbAdaptor::BulkTransfer(
OLA_UNUSED struct libusb_device_handle *dev_handle,
OLA_UNUSED unsigned char endpoint,
OLA_UNUSED unsigned char *data,
OLA_UNUSED int length,
OLA_UNUSED int *transferred,
OLA_UNUSED unsigned int timeout) {
OLA_WARN << "libusb_bulk_transfer in an AsyncronousLibUsbAdaptor";
return LIBUSB_ERROR_NOT_SUPPORTED;
struct libusb_device_handle *dev_handle,
unsigned char endpoint,
unsigned char *data,
int length,
int *transferred,
unsigned int timeout) {
OLA_DEBUG << "libusb_bulk_transfer in an AsyncronousLibUsbAdaptor";
return BaseLibUsbAdaptor::BulkTransfer(dev_handle, endpoint, data, length,
transferred, timeout);
}

int AsyncronousLibUsbAdaptor::InterruptTransfer(
Expand All @@ -373,8 +376,9 @@ int AsyncronousLibUsbAdaptor::InterruptTransfer(
OLA_UNUSED int length,
OLA_UNUSED int *actual_length,
OLA_UNUSED unsigned int timeout) {
OLA_WARN << "libusb_interrupt_transfer in an AsyncronousLibUsbAdaptor";
return LIBUSB_ERROR_NOT_SUPPORTED;
OLA_DEBUG << "libusb_interrupt_transfer in an AsyncronousLibUsbAdaptor";
return BaseLibUsbAdaptor::InterruptTransfer(dev_handle, endpoint, data,
length, actual_length, timeout);
}
} // namespace usbdmx
} // namespace plugin
Expand Down