Fix binary compatibility to the official LibUSB 1.0.
This is useful for GNU/kFreeBSD and the libusb2debian port. Applications using the asynchronous API of LibUSB 1.0 needs to be recompiled after this update. Found by: lme @
This commit is contained in:
parent
fca56fb2c3
commit
85ff9a0313
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=234684
@ -340,7 +340,7 @@ typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
|
|||||||
typedef struct libusb_transfer {
|
typedef struct libusb_transfer {
|
||||||
libusb_device_handle *dev_handle;
|
libusb_device_handle *dev_handle;
|
||||||
uint8_t flags;
|
uint8_t flags;
|
||||||
uint32_t endpoint;
|
uint8_t endpoint;
|
||||||
uint8_t type;
|
uint8_t type;
|
||||||
uint32_t timeout;
|
uint32_t timeout;
|
||||||
enum libusb_transfer_status status;
|
enum libusb_transfer_status status;
|
||||||
@ -349,7 +349,6 @@ typedef struct libusb_transfer {
|
|||||||
libusb_transfer_cb_fn callback;
|
libusb_transfer_cb_fn callback;
|
||||||
void *user_data;
|
void *user_data;
|
||||||
uint8_t *buffer;
|
uint8_t *buffer;
|
||||||
void *os_priv;
|
|
||||||
int num_iso_packets;
|
int num_iso_packets;
|
||||||
struct libusb_iso_packet_descriptor iso_packet_desc[0];
|
struct libusb_iso_packet_descriptor iso_packet_desc[0];
|
||||||
} libusb_transfer __aligned(sizeof(void *));
|
} libusb_transfer __aligned(sizeof(void *));
|
||||||
|
@ -1322,7 +1322,7 @@ libusb_submit_transfer(struct libusb_transfer *uxfer)
|
|||||||
struct libusb20_transfer *pxfer1;
|
struct libusb20_transfer *pxfer1;
|
||||||
struct libusb_super_transfer *sxfer;
|
struct libusb_super_transfer *sxfer;
|
||||||
struct libusb_device *dev;
|
struct libusb_device *dev;
|
||||||
uint32_t endpoint;
|
uint8_t endpoint;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (uxfer == NULL)
|
if (uxfer == NULL)
|
||||||
@ -1333,9 +1333,6 @@ libusb_submit_transfer(struct libusb_transfer *uxfer)
|
|||||||
|
|
||||||
endpoint = uxfer->endpoint;
|
endpoint = uxfer->endpoint;
|
||||||
|
|
||||||
if (endpoint > 255)
|
|
||||||
return (LIBUSB_ERROR_INVALID_PARAM);
|
|
||||||
|
|
||||||
dev = libusb_get_device(uxfer->dev_handle);
|
dev = libusb_get_device(uxfer->dev_handle);
|
||||||
|
|
||||||
DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_submit_transfer enter");
|
DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_submit_transfer enter");
|
||||||
@ -1385,7 +1382,7 @@ libusb_cancel_transfer(struct libusb_transfer *uxfer)
|
|||||||
struct libusb20_transfer *pxfer1;
|
struct libusb20_transfer *pxfer1;
|
||||||
struct libusb_super_transfer *sxfer;
|
struct libusb_super_transfer *sxfer;
|
||||||
struct libusb_device *dev;
|
struct libusb_device *dev;
|
||||||
uint32_t endpoint;
|
uint8_t endpoint;
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
if (uxfer == NULL)
|
if (uxfer == NULL)
|
||||||
@ -1397,9 +1394,6 @@ libusb_cancel_transfer(struct libusb_transfer *uxfer)
|
|||||||
|
|
||||||
endpoint = uxfer->endpoint;
|
endpoint = uxfer->endpoint;
|
||||||
|
|
||||||
if (endpoint > 255)
|
|
||||||
return (LIBUSB_ERROR_INVALID_PARAM);
|
|
||||||
|
|
||||||
dev = libusb_get_device(uxfer->dev_handle);
|
dev = libusb_get_device(uxfer->dev_handle);
|
||||||
|
|
||||||
DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_cancel_transfer enter");
|
DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_cancel_transfer enter");
|
||||||
|
Loading…
Reference in New Issue
Block a user