From d21ebe47ce578c93cd8969be1c933d503e32e5d4 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sat, 8 Mar 2008 12:48:35 +0000 Subject: Rework URB API naming Now refer to everything as "transfers" as consistent with the USB spec libusb_transfer is now a kind of transfer handle. To reduce confusion with libusb_bulk_transfer and libusb_control_transfer, those have been renamed to libusb_{control,bulk}_transfer_request. --- libusb/libusbi.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libusb/libusbi.h') diff --git a/libusb/libusbi.h b/libusb/libusbi.h index 4ff8e38..185e54d 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -157,16 +157,16 @@ struct libusb_dev_handle { int fd; }; -enum libusb_urb_type { - LIBUSB_URB_CONTROL, - LIBUSB_URB_BULK, +enum libusb_transfer_type { + LIBUSB_TRANSFER_CONTROL, + LIBUSB_TRANSFER_BULK, }; -#define LIBUSB_URBH_DATA_BELONGS_TO_USER (1<<0) -#define LIBUSB_URBH_SYNC_CANCELLED (1<<1) -#define LIBUSB_URBH_TIMED_OUT (1<<2) +#define USBI_TRANSFER_DATA_BELONGS_TO_USER (1<<0) +#define USBI_TRANSFER_SYNC_CANCELLED (1<<1) +#define USBI_TRANSFER_TIMED_OUT (1<<2) -struct libusb_urb_handle { +struct libusb_transfer { struct libusb_dev_handle *devh; struct usb_urb urb; struct list_head list; -- cgit v1.2.1