d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix binary compatibility to the official LibUSB 1.0.

Browse Source 
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:
Hans Petter Selasky 2012-04-25 17:54:26 +00:00
parent fca56fb2c3
commit 85ff9a0313
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=234684
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libusb/libusb.h
View File

@ -340,7 +340,7 @@ typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
typedef struct libusb_transfer {
libusb_device_handle *dev_handle;
uint8_t flags;
uint32_t endpoint;
uint8_t endpoint;
uint8_t type;
uint32_t timeout;
enum libusb_transfer_status status;
@ -349,7 +349,6 @@ typedef struct libusb_transfer {
libusb_transfer_cb_fn callback;
void *user_data;
uint8_t *buffer;
void *os_priv;
int num_iso_packets;
struct libusb_iso_packet_descriptor iso_packet_desc[0];
} libusb_transfer __aligned(sizeof(void *));

10
lib/libusb/libusb10.c
View File

@ -1322,7 +1322,7 @@ libusb_submit_transfer(struct libusb_transfer *uxfer)
struct libusb20_transfer *pxfer1;
struct libusb_super_transfer *sxfer;
struct libusb_device *dev;
uint32_t endpoint;
uint8_t endpoint;
int err;
if (uxfer == NULL)
@ -1333,9 +1333,6 @@ libusb_submit_transfer(struct libusb_transfer *uxfer)
endpoint = uxfer->endpoint;
if (endpoint > 255)
return (LIBUSB_ERROR_INVALID_PARAM);
dev = libusb_get_device(uxfer->dev_handle);
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 libusb_super_transfer *sxfer;
struct libusb_device *dev;
uint32_t endpoint;
uint8_t endpoint;
int retval;
if (uxfer == NULL)
@ -1397,9 +1394,6 @@ libusb_cancel_transfer(struct libusb_transfer *uxfer)
endpoint = uxfer->endpoint;
if (endpoint > 255)
return (LIBUSB_ERROR_INVALID_PARAM);
dev = libusb_get_device(uxfer->dev_handle);
DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_cancel_transfer enter");