aboutsummaryrefslogtreecommitdiff
path: root/lib/libusb/libusb20.h
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-11-20 08:57:25 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-11-20 08:57:25 +0000
commit4594d907db0042ec024fd46cdbaa4bed9a51cd35 (patch)
treee74fa51115d91a6aafc7339f0f35e68ec522dd82 /lib/libusb/libusb20.h
parent1c8a163c8b98fa957416081cb59514ba09b79e06 (diff)
downloadsrc-4594d907db0042ec024fd46cdbaa4bed9a51cd35.tar.gz
src-4594d907db0042ec024fd46cdbaa4bed9a51cd35.zip
Sync to P4
- fix a transfer cancelling bug/segfault [1] - correct a return code in the transfer cancel function. - add new API function, libusb20_tr_bulk_intr_sync(). Submitted by: HPS Reported by: Robert Jenssen [1]
Notes
Notes: svn path=/head/; revision=199575
Diffstat (limited to 'lib/libusb/libusb20.h')
-rw-r--r--lib/libusb/libusb20.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libusb/libusb20.h b/lib/libusb/libusb20.h
index 9f45861f7388..bb7d8a4ab3d2 100644
--- a/lib/libusb/libusb20.h
+++ b/lib/libusb/libusb20.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+ * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
* Copyright (c) 2001 Johannes Erdfelt. All rights reserved.
*
@@ -226,6 +226,7 @@ void libusb20_tr_setup_bulk(struct libusb20_transfer *xfer, void *pbuf, uint32_t
void libusb20_tr_setup_control(struct libusb20_transfer *xfer, void *psetup, void *pbuf, uint32_t timeout);
void libusb20_tr_setup_intr(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t timeout);
void libusb20_tr_setup_isoc(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint16_t fr_index);
+uint8_t libusb20_tr_bulk_intr_sync(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t *pactlen, uint32_t timeout);
void libusb20_tr_start(struct libusb20_transfer *xfer);
void libusb20_tr_stop(struct libusb20_transfer *xfer);
void libusb20_tr_submit(struct libusb20_transfer *xfer);