From owner-svn-src-all@FreeBSD.ORG Wed Apr 25 17:54:27 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A34A1065674; Wed, 25 Apr 2012 17:54:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F05C08FC12; Wed, 25 Apr 2012 17:54:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3PHsQ93008777; Wed, 25 Apr 2012 17:54:26 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3PHsQ3t008774; Wed, 25 Apr 2012 17:54:26 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201204251754.q3PHsQ3t008774@svn.freebsd.org> From: Hans Petter Selasky Date: Wed, 25 Apr 2012 17:54:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234684 - head/lib/libusb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2012 17:54:27 -0000 Author: hselasky Date: Wed Apr 25 17:54:26 2012 New Revision: 234684 URL: http://svn.freebsd.org/changeset/base/234684 Log: 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 @ Modified: head/lib/libusb/libusb.h head/lib/libusb/libusb10.c Modified: head/lib/libusb/libusb.h ============================================================================== --- head/lib/libusb/libusb.h Wed Apr 25 12:02:06 2012 (r234683) +++ head/lib/libusb/libusb.h Wed Apr 25 17:54:26 2012 (r234684) @@ -340,7 +340,7 @@ typedef void (*libusb_transfer_cb_fn) (s 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 *)); Modified: head/lib/libusb/libusb10.c ============================================================================== --- head/lib/libusb/libusb10.c Wed Apr 25 12:02:06 2012 (r234683) +++ head/lib/libusb/libusb10.c Wed Apr 25 17:54:26 2012 (r234684) @@ -1322,7 +1322,7 @@ libusb_submit_transfer(struct libusb_tra 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_tra 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_tra 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_tra 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");