diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-02-26 09:18:02 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-02-26 09:18:02 -0800 |
| commit | 136346391677455b9259e446c8445e7fbb1ad36e (patch) | |
| tree | be2924eca685c3fe9d37080ed8ca3243f1b87052 /libusb/libusbi.h | |
| parent | 6816bb40a3bf3e80eb7f86f4dd368f8be76667c5 (diff) | |
| download | libusb-136346391677455b9259e446c8445e7fbb1ad36e.tar.gz | |
core: Use a consistent variable name for usbi_transfer structures
Most places in the library use the name 'itransfer' when referring to a
usbi_transfer structure. This is helpful to distinguish between the
public libusb_transfer structure and the internal structure. Fix up the
few places that don't follow this convention so that it is consistent
across the entire library.
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'libusb/libusbi.h')
| -rw-r--r-- | libusb/libusbi.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libusb/libusbi.h b/libusb/libusbi.h index 2ce448a..3069101 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -267,8 +267,8 @@ void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level, #define DEVICE_CTX(dev) ((dev)->ctx) #define HANDLE_CTX(handle) (DEVICE_CTX((handle)->dev)) #define TRANSFER_CTX(transfer) (HANDLE_CTX((transfer)->dev_handle)) -#define ITRANSFER_CTX(transfer) \ - (TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer))) +#define ITRANSFER_CTX(itransfer) \ + (TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer))) #define IS_EPIN(ep) (0 != ((ep) & LIBUSB_ENDPOINT_IN)) #define IS_EPOUT(ep) (!IS_EPIN(ep)) @@ -515,19 +515,19 @@ enum usbi_transfer_timeout_flags { USBI_TRANSFER_TIMED_OUT = 1U << 2, }; -#define USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \ - ((struct libusb_transfer *)(((unsigned char *)(transfer)) \ +#define USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer) \ + ((struct libusb_transfer *)(((unsigned char *)(itransfer)) \ + sizeof(struct usbi_transfer))) #define LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer) \ ((struct usbi_transfer *)(((unsigned char *)(transfer)) \ - sizeof(struct usbi_transfer))) -static inline void *usbi_transfer_get_os_priv(struct usbi_transfer *transfer) +static inline void *usbi_transfer_get_os_priv(struct usbi_transfer *itransfer) { - assert(transfer->num_iso_packets >= 0); - return ((unsigned char *)transfer) + sizeof(struct usbi_transfer) + assert(itransfer->num_iso_packets >= 0); + return ((unsigned char *)itransfer) + sizeof(struct usbi_transfer) + sizeof(struct libusb_transfer) - + ((size_t)transfer->num_iso_packets + + ((size_t)itransfer->num_iso_packets * sizeof(struct libusb_iso_packet_descriptor)); } @@ -553,8 +553,8 @@ void usbi_handle_disconnect(struct libusb_device_handle *dev_handle); int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, enum libusb_transfer_status status); -int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer); -void usbi_signal_transfer_completion(struct usbi_transfer *transfer); +int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer); +void usbi_signal_transfer_completion(struct usbi_transfer *itransfer); int usbi_parse_descriptor(const unsigned char *source, const char *descriptor, void *dest, int host_endian); |