Libusb updates

.gitignore

@@ -50,3 +50,7 @@ Release
 *~
 *.orig
 .dirstamp
+*.swn
+*.swm
+*.swo
+.amend

.travis.yml

@@ -0,0 +1,29 @@
+# Require trusty for now as it has a more recent version of autoconf
+sudo: required
+dist: trusty
+language: c
+
+compiler:
+    - gcc
+    - clang
+
+os:
+    - linux
+    - osx
+
+
+addons:
+    apt:
+        packages:
+            - autoconf
+            - automake
+            - libtool
+            - m4
+            - libudev-dev
+        sources:
+            - ubuntu-toolchain-r-test
+
+script:
+    - ./autogen.sh && make -j4
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./travis-autogen.sh --disable-udev && make -j4; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd Xcode && xcodebuild -project libusb.xcodeproj ; fi

AUTHORS

@@ -1,27 +1,29 @@
 Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
 Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
 Copyright © 2010-2012 Peter Stuge <peter@stuge.se>
-Copyright © 2008-2013 Nathan Hjelm <hjelmn@users.sourceforge.net>
+Copyright © 2008-2016 Nathan Hjelm <hjelmn@users.sourceforge.net>
 Copyright © 2009-2013 Pete Batard <pete@akeo.ie>
 Copyright © 2009-2013 Ludovic Rousseau <ludovic.rousseau@gmail.com>
 Copyright © 2010-2012 Michael Plante <michael.plante@gmail.com>
 Copyright © 2011-2013 Hans de Goede <hdegoede@redhat.com>
 Copyright © 2012-2013 Martin Pieuchot <mpi@openbsd.org>
 Copyright © 2012-2013 Toby Gray <toby.gray@realvnc.com>
+Copyright © 2013-2015 Chris Dickens <christopher.a.dickens@gmail.com>
 
 Other contributors:
+Akshay Jaggi
 Alan Ott
 Alan Stern
 Alex Vatchenko
 Andrew Fernandes
 Anthony Clay
+Antonio Ospite
 Artem Egorkine
 Aurelien Jarno
 Bastien Nocera
 Bei Zhang
 Benjamin Dobell
 Carl Karsten
-Chris Dickens
 Colin Walters
 Dave Camarillo
 David Engraf
@@ -32,6 +34,7 @@ Felipe Balbi
 Florian Albrechtskirchinger
 Francesco Montorsi
 Francisco Facioni
+Gaurav Gupta
 Graeme Gill
 Gustavo Zacarias
 Hans Ulrich Niedermann
@@ -48,7 +51,9 @@ Kuangye Guo
 Lars Kanis
 Lars Wirzenius
 Luca Longinotti
+Marcus Meissner
 Markus Heidelberg
+Martin Ettl
 Martin Koegler
 Matthias Bolte
 Mike Frysinger
@@ -64,15 +69,21 @@ Rob Walker
 Sean McBride
 Sebastian Pipping
 Simon Haggett
+Simon Newton
 Thomas Röfer
+Tim Hutt
 Tim Roberts
+Tobias Klauser
 Toby Peterson
+Tormod Volden
 Trygve Laugstøl
 Uri Lublin
 Vasily Khoruzhick
 Vegard Storheil Eriksen
+Venkatesh Shukla
 Vitali Lovich
 Xiaofan Chen
 Zoltán Kovács
 Роман Донченко
+parafin
 xantares

ChangeLog

@@ -1,14 +1,43 @@
 For detailed information about the changes below, please see the git log or
 visit: http://log.libusb.info
 
+2016-07-20: v1.0.21:
+* Core: Refactor code related to transfer flags and timeout handling
+* Darwin: Ignore root hub simulation devices
+* Darwin: Improved support for OS X El Capitan
+* Linux: Support preallocating kernel memory for zerocopy USB
+* Linux: Deal with receiving POLLERR before all transfers have completed
+* Solaris: Add solaris backend
+* Windows: Add Visual Studio 2015 support
+* Prevent attempts to recursively handle events
+* Fix race condition in handle_timeout()
+* Allow transferred argument to be optional in bulk APIs
+* Various other bug fixes and improvements
+
+2015-09-13: v1.0.20
+* Add Haiku support
+* Fix multiple memory and resource leaks (#16, #52, #76, #81)
+* Fix possible deadlock when executing transfer callback
+* New libusb_free_pollfds() API
+* Darwin: Fix devices not being detected on OS X 10.8 (#48)
+* Linux: Allow larger isochronous transfer submission (#23)
+* Windows: Fix broken builds Cygwin/MinGW builds and compiler warnings
+* Windows: Fix broken bus number lookup
+* Windows: Improve submission of control requests for composite devices
+* Examples: Add two-stage load support to fxload (#12)
+* Correctly report cancellations due to timeouts
+* Improve efficiency of event handling
+* Improve speed of transfer submission in multi-threaded environments
+* Various other bug fixes and improvements
+The (#xx) numbers are libusb issue numbers, see ie:
+https://github.com/libusb/libusb/issues/16
+
 2014-05-30: v1.0.19
 * Add support for USB bulk streams on Linux and Mac OS X (#11)
 * Windows: Add AMD and Intel USB-3.0 root hub support
 * Windows: Fix USB 3.0 speed detection on Windows 8 or later (#10)
 * Added Russian translation for libusb_strerror strings
 * All: Various small fixes and cleanups
-The (#xx) numbers are libusb issue numbers, see ie:
-https://github.com/libusb/libusb/issues/11
 
 2014-01-25: v1.0.18
 * Fix multiple memory leaks

README

@@ -0,0 +1 @@
+README.md

README.md

@@ -0,0 +1,33 @@
+# libusb
+
+[![Build Status](https://travis-ci.org/libusb/libusb.svg?branch=master)](https://travis-ci.org/libusb/libusb)
+[![Build status](https://ci.appveyor.com/api/projects/status/xvrfam94jii4a6lw?svg=true)](https://ci.appveyor.com/project/LudovicRousseau/libusb)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/2180/badge.svg)](https://scan.coverity.com/projects/libusb-libusb)
+
+libusb is a library for USB device access from Linux, Mac OS X,
+Windows, OpenBSD/NetBSD and Haiku userspace.
+It is written in C (Haiku backend in C++) and licensed under the GNU
+Lesser General Public License version 2.1 or, at your option, any later
+version (see [COPYING](COPYING)).
+
+libusb is abstracted internally in such a way that it can hopefully
+be ported to other operating systems. Please see the [PORTING](PORTING)
+file for more information.
+
+libusb homepage:
+http://libusb.info/
+
+Developers will wish to consult the API documentation:
+http://api.libusb.info
+
+Use the mailing list for questions, comments, etc:
+http://mailing-list.libusb.info
+
+- Pete Batard <pete@akeo.ie>
+- Hans de Goede <hdegoede@redhat.com>
+- Xiaofan Chen <xiaofanc@gmail.com>
+- Ludovic Rousseau <ludovic.rousseau@gmail.com>
+- Nathan Hjelm <hjelmn@users.sourceforge.net>
+- Chris Dickens <christopher.a.dickens@gmail.com>
+
+(Please use the mailing list rather than mailing developers directly)

TODO

@@ -1,2 +1,2 @@
 Please see the libusb roadmap by visiting:
-https://github.com/libusb/libusb/issues/milestones?direction=asc&sort=due_date
+https://github.com/libusb/libusb/milestones?direction=asc&sort=due_date&state=open

android/README

@@ -24,8 +24,10 @@ The libusb library, examples and tests can then be found in:
 Where $ARCH is one of:
     armeabi
     armeabi-v7a
+    mips
+    mips64
     x86
-
+    x86_64
 
 Installing:
 -----------
@@ -62,7 +64,7 @@ image of a running device:
     # Install libusb
     adb push obj/local/armeabi/libusb1.0.so /sdcard/
     adb shell su -c "cat > /system/lib/libusb1.0.so < /sdcard/libusb1.0.so"
-    adb shell rm /system/lib/libusb1.0.so
+    adb shell rm /sdcard/libusb1.0.so
 
     # Install the samples and tests
     for B in listdevs fxload xusb sam3u_benchmark hotplugtest stress

appveyor.yml

@@ -0,0 +1,41 @@
+version: 1.0.{build}
+configuration:
+- Debug
+- Release
+platform:
+- x64
+- Win32
+build:
+  project: msvc\libusb_2013.sln
+  parallel: true
+  verbosity: detailed
+environment:
+  matrix:
+  - libusb_2015: msvc\libusb_2015.sln
+    libusb_2013: msvc\libusb_2013.sln
+    libusb_2012: msvc\libusb_2012.sln
+    libusb_2010: msvc\libusb_2010.sln
+install:
+
+- cmd: >-
+    rem Copying libusb to cygwin home directory
+
+    xcopy /S C:\projects\libusb C:\cygwin\home\appveyor\
+
+    rem Copying libusb to MinGW home directory
+
+    xcopy /S C:\projects\libusb C:\msys64\home\appveyor\
+
+build_script:
+- cmd: >-
+    msbuild %libusb_2015% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    msbuild %libusb_2013% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    msbuild %libusb_2012% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    msvc/appveyor.bat
+
+    appveyor_minGW.bat
+
+    appveyor_cygwin.bat

appveyor_cygwin.bat

@@ -0,0 +1,14 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+if [%Configuration%] NEQ [Debug] goto releaseWin32
+
+:releaseWin32
+if [%Platform%] NEQ [Win32] exit 0
+if [%Configuration%] NEQ [Release] exit 0
+C:\cygwin\bin\bash -e -l -c "mkdir build-Win32-cygwin"
+C:\cygwin\bin\bash -e -l -c ./autogen.sh
+C:\cygwin\bin\bash -e -l -c "cd build-Win32-cygwin"
+C:\cygwin\bin\bash -e -l -c "build-Win32-cygwin/../configure"
+C:\cygwin\bin\bash -e -l -c "make -j4"
+C:\cygwin\bin\bash -e -l -c "make install"

appveyor_minGW.bat

@@ -0,0 +1,24 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+if [%Configuration%] NEQ [Debug] goto releasex64
+
+:releasex64
+if [%Platform%] NEQ [x64] goto releaseWin32
+if [%Configuration%] NEQ [Release] exit 0
+C:\msys64\usr\bin\bash -e -l -c "mkdir build-x64"
+C:\msys64\usr\bin\bash -e -l -c ./autogen.sh
+C:\msys64\usr\bin\bash -e -l -c "cd build-x64"
+C:\msys64\usr\bin\bash -e -l -c "build-x64/../configure --prefix=/mingw64 --build=--build= --host=x86_64-w64-mingw32"
+C:\msys64\usr\bin\bash -e -l -c "make -j4"
+C:\msys64\usr\bin\bash -e -l -c "make install"
+
+:releaseWin32
+if [%Platform%] NEQ [Win32] exit 0
+if [%Configuration%] NEQ [Release] exit 0
+C:\msys64\usr\bin\bash -e -l -c "mkdir build-Win32"
+C:\msys64\usr\bin\bash -e -l -c ./autogen.sh
+C:\msys64\usr\bin\bash -e -l -c "cd build-Win32"
+C:\msys64\usr\bin\bash -e -l -c "build-Win32/../configure --prefix=/mingw32 --build=i686-w64-mingw32 --host=i686-w64-mingw32"
+C:\msys64\usr\bin\bash -e -l -c "make -j4"
+C:\msys64\usr\bin\bash -e -l -c "make install"

autogen.sh

@@ -4,5 +4,5 @@ set -e
 
 ./bootstrap.sh
 if test -z "$NOCONFIGURE"; then
-    exec ./configure --enable-maintainer-mode --enable-examples-build --enable-tests-build "$@"
+    exec ./configure --enable-examples-build --enable-tests-build "$@"
 fi

bootstrap.sh

@@ -1,27 +1,6 @@
 #!/bin/sh
 
-set -e
-
-# use libtoolize if available, otherwise look for glibtoolize (darwin)
-if (libtoolize --version) < /dev/null > /dev/null 2>&1; then
-  LIBTOOLIZE=libtoolize
-elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
-  LIBTOOLIZE=glibtoolize
-else
-  echo "libtoolize or glibtoolize was not found! Please install libtool." 1>&2
-  exit 1
+if ! test -d m4 ; then
+    mkdir m4
 fi
-
-# run autotools on haiku package
-cd libusb/os/haiku || exit 1
-$LIBTOOLIZE --copy --force || exit 1
-aclocal || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
-cd ../../..
-
-$LIBTOOLIZE --copy --force || exit 1
-aclocal || exit 1
-autoheader || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
+autoreconf -ivf || exit 1