diff options
| author | Daniel Drake <dsd@gentoo.org> | 2008-04-27 23:50:01 +0100 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2008-04-29 12:08:39 +0100 |
| commit | d3ab4e3bd4068cba41c1e12c4b175018dc3cb343 (patch) | |
| tree | 01fc599e5b413f85dd8507ea7b2be6d3b74bb38a /libusb/sync.c | |
| parent | 379e90e0fdcef6f4db1849fa0a7fd524407cf564 (diff) | |
| download | libusb-d3ab4e3bd4068cba41c1e12c4b175018dc3cb343.tar.gz | |
Rename endpoint_type to transfer_type
Matches the USB specs more closely
Diffstat (limited to 'libusb/sync.c')
| -rw-r--r-- | libusb/sync.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libusb/sync.c b/libusb/sync.c index 3cfd013..dd8e253 100644 --- a/libusb/sync.c +++ b/libusb/sync.c @@ -135,7 +135,7 @@ static void bulk_transfer_cb(struct libusb_transfer *transfer) static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *buffer, int length, - int *transferred, unsigned int timeout, unsigned char endpoint_type) + int *transferred, unsigned int timeout, unsigned char type) { struct libusb_transfer *transfer = libusb_alloc_transfer(0); int completed = 0; @@ -146,7 +146,7 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle, libusb_fill_bulk_transfer(transfer, dev_handle, endpoint, buffer, length, bulk_transfer_cb, &completed, timeout); - transfer->endpoint_type = endpoint_type; + transfer->type = type; r = libusb_submit_transfer(transfer); if (r < 0) { @@ -224,7 +224,7 @@ API_EXPORTED int libusb_bulk_transfer(struct libusb_device_handle *dev_handle, unsigned int timeout) { return do_sync_bulk_transfer(dev_handle, endpoint, data, length, - transferred, timeout, LIBUSB_ENDPOINT_TYPE_BULK); + transferred, timeout, LIBUSB_TRANSFER_TYPE_BULK); } /** \ingroup syncio @@ -269,6 +269,6 @@ API_EXPORTED int libusb_interrupt_transfer( unsigned char *data, int length, int *transferred, unsigned int timeout) { return do_sync_bulk_transfer(dev_handle, endpoint, data, length, - transferred, timeout, LIBUSB_ENDPOINT_TYPE_INTERRUPT); + transferred, timeout, LIBUSB_TRANSFER_TYPE_INTERRUPT); } |