diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libusb | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'lib/libusb')
| -rw-r--r-- | lib/libusb/Makefile | 3 | ||||
| -rw-r--r-- | lib/libusb/libusb.3 | 4 | ||||
| -rw-r--r-- | lib/libusb/libusb.h | 2 | ||||
| -rw-r--r-- | lib/libusb/libusb20.3 | 2 | ||||
| -rw-r--r-- | lib/libusb/libusb20_desc.h | 6 |
5 files changed, 12 insertions, 5 deletions
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 1ef85d4b6f50..24d97fd63aac 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -19,8 +19,7 @@ PTHREAD_LIBS?= -lpthread WARNS?= 2 -DPADD= ${LIBPTHREAD} -LDADD= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS+= libusb.3 usb.3 diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3 index 785c8c475768..d00cb3fc5d4f 100644 --- a/lib/libusb/libusb.3 +++ b/lib/libusb/libusb.3 @@ -42,9 +42,9 @@ The .Nm library contains interfaces for directly managing a usb device. The current implementation supports v1.0 of the libusb API. -.Sh LIBRARY INITIALISATION / DEINITIALISATION +.Sh LIBRARY INITIALISATION AND DEINITIALISATION .Ft int -.Fn libusb_init libusb_context **ctx +.Fn libusb_init "libusb_context **ctx" This function initialises libusb. It must be called at the beginning of the program, before other libusb routines are used. diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 7f8634fc5158..ab20e92fc5ae 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -128,6 +128,8 @@ enum libusb_standard_request { LIBUSB_REQUEST_GET_INTERFACE = 0x0A, LIBUSB_REQUEST_SET_INTERFACE = 0x0B, LIBUSB_REQUEST_SYNCH_FRAME = 0x0C, + LIBUSB_REQUEST_SET_SEL = 0x30, + LIBUSB_REQUEST_SET_ISOCH_DELAY = 0x31, }; enum libusb_request_type { diff --git a/lib/libusb/libusb20.3 b/lib/libusb/libusb20.3 index f6004a534fdb..590ff3c03c1c 100644 --- a/lib/libusb/libusb20.3 +++ b/lib/libusb/libusb20.3 @@ -1053,8 +1053,8 @@ This function does not return NULL. .It Pa /dev/usb .El .Sh SEE ALSO -.Xr usb 4 , .Xr libusb 3 , +.Xr usb 4 , .Xr usbconfig 8 , .Xr usbdump 8 . diff --git a/lib/libusb/libusb20_desc.h b/lib/libusb/libusb20_desc.h index 48e2715d2003..c5f085f30cff 100644 --- a/lib/libusb/libusb20_desc.h +++ b/lib/libusb/libusb20_desc.h @@ -481,6 +481,12 @@ enum libusb20_standard_request { /** Set then report an endpoint's synchronization frame */ LIBUSB20_REQUEST_SYNCH_FRAME = 0x0C, + + /** Set U1 and U2 system exit latency */ + LIBUSB20_REQUEST_SET_SEL = 0x30, + + /** Set isochronous delay */ + LIBUSB20_REQUEST_SET_ISOCH_DELAY = 0x31, }; /** \ingroup misc |