misc: revert all references to libusb/libusb.infomergeback

author: hjelmn <Nathan Hjelm hjelmn@cs.unm.edu> 2013-12-11 23:52:34 +0000
committer: Pete Batard <pete@akeo.ie> 2013-12-30 21:58:07 +0000
commit: 8cb3cb34fb7dca5d7586c68a61f2761a2e103195 (patch)
tree: 6a244d89d3b7b8c4c4d2accb7822acb9450eb2ba
parent: 8b46e1c088167eb86b1712765896e2f17d70d148 (diff)
download: libusb-mergeback.tar.gz
77 files changed, 447 insertions, 1309 deletions
diff --git a/.private/README.txt b/.private/README.txt
index 9894138..7f63479 100644
--- a/.private/README.txt
+++ b/.private/README.txt
@@ -1,4 +1,4 @@
-This directory contains private internal scripts used by the libusbx
+This directory contains private internal scripts used by the libusb
 project maintainers.
 
 These scripts are not intended for general usage and will not be
diff --git a/.private/bm.sh b/.private/bm.sh
index 217baf8..520c3a5 100644
--- a/.private/bm.sh
+++ b/.private/bm.sh
@@ -6,9 +6,9 @@ PWD=`pwd`
 cd ..
 date=`date +%Y.%m.%d`
 target=e:/dailies/$date
-mkdir -p $target/include/libusbx-1.0
+mkdir -p $target/include/libusb-1.0
 cp -v libusb/libusb-1.0.def $target
-cp -v libusb/libusb.h $target/include/libusbx-1.0
+cp -v libusb/libusb.h $target/include/libusb-1.0
 
 #
 # 32 bit binaries
diff --git a/.private/bwince.cmd b/.private/bwince.cmd
index 91a0b2f..0cc7477 100755
--- a/.private/bwince.cmd
+++ b/.private/bwince.cmd
@@ -12,7 +12,7 @@ set WINCE_TARGET_DIR=%WINCE_TARGET_DIR_BASE%\%DATE:/=-%
 set MSBUILD_CMD=msbuild.exe
 set MSBUILD_TARGET=Rebuild
 set MSBUILD_CONFIGURATION=Release
-set WINCE_SLN=msvc\libusbx_wince.sln
+set WINCE_SLN=msvc\libusb_wince.sln
 set PLATFORM_PREFIX=STANDARDSDK_500 (
 set PLATFORM_POSTFIX=)
 
@@ -21,9 +21,9 @@ set PWD=%~dp0
 cd ..
 
 mkdir %WINCE_TARGET_DIR%
-mkdir %WINCE_TARGET_DIR%\include\libusbx-1.0
+mkdir %WINCE_TARGET_DIR%\include\libusb-1.0
 copy libusb\libusb-1.0.def %WINCE_TARGET_DIR%
-copy libusb\libusb.h %WINCE_TARGET_DIR%\include\libusbx-1.0
+copy libusb\libusb.h %WINCE_TARGET_DIR%\include\libusb-1.0
 for %%A in (%WINCE_TARGET_ARCHES%) do mkdir %WINCE_TARGET_DIR%\%%A
 for %%A in (%WINCE_TARGET_ARCHES%) do mkdir %WINCE_TARGET_DIR%\%%A\static
 for %%A in (%WINCE_TARGET_ARCHES%) do mkdir %WINCE_TARGET_DIR%\%%A\dll
diff --git a/.private/post-rewrite.sh b/.private/post-rewrite.sh
index b5fff07..0ac4847 100755
--- a/.private/post-rewrite.sh
+++ b/.private/post-rewrite.sh
@@ -10,7 +10,7 @@
 # fi
 #
 # NOTE: These versioning hooks are intended to be used *INTERNALLY* by the
-# libusbx development team and are NOT intended to solve versioning for any
+# libusb development team and are NOT intended to solve versioning for any
 # derivative branch, such as one you would create for private development.
 #
 
diff --git a/.private/pre-commit.sh b/.private/pre-commit.sh
index 7c95674..c495e33 100755
--- a/.private/pre-commit.sh
+++ b/.private/pre-commit.sh
@@ -12,12 +12,12 @@
 # fi
 #
 # NOTE: These versioning hooks are intended to be used *INTERNALLY* by the
-# libusbx development team and are NOT intended to solve versioning for any
+# libusb development team and are NOT intended to solve versioning for any
 # derivative branch, such as one you would create for private development.
 #
 # Should you wish to reuse these scripts for your own versioning, in your own
 # private branch, we kindly ask you to first set BRANCH_OFFSET to 60000, or
-# higher, as any offset below below 60000 is *RESERVED* for libusbx official
+# higher, as any offset below below 60000 is *RESERVED* for libusb official
 # usage.
 
 ################################################################################
diff --git a/.private/wbs.txt b/.private/wbs.txt
index 2e2d9d8..2ad8395 100644
--- a/.private/wbs.txt
+++ b/.private/wbs.txt
@@ -1,13 +1,13 @@
-              libusbx 1.0 Windows binary snapshot - README
+              libusb 1.0 Windows binary snapshot - README
 
    *********************************************************************
    *  The latest version of this snapshot can always be downloaded at: *
-   *         https://sourceforge.net/projects/libusbx/files/           *
+   *         https://sourceforge.net/projects/libusb/files/           *
    *********************************************************************
 
 o Visual Studio:
   - Open existing or create a new project for your application
-  - Copy libusb.h, from the include\libusbx-1.0\ directory, into your project and
+  - Copy libusb.h, from the include\libusb-1.0\ directory, into your project and
     make sure that the location where the file reside appears in the 'Additional
     Include Directories' section (Configuration Properties -> C/C++ -> General).
   - Copy the relevant .lib file from MS32\ or MS64\ and add 'libusb-1.0.lib' to
@@ -15,18 +15,18 @@ o Visual Studio:
     Also make sure that the directory where libusb-1.0.lib resides is added to
     'Additional Library Directories' (Configuration Properties -> Linker
     -> General)
-  - If you use the static version of the libusbx library, make sure that
+  - If you use the static version of the libusb library, make sure that
     'Runtime Library' is set to 'Multi-threaded DLL (/MD)' (Configuration
     Properties -> C/C++ -> Code Generation).
     NB: If your application requires /MT (Multi-threaded/libCMT), you need to
-    recompile a static libusbx 1.0 library from source.
+    recompile a static libusb 1.0 library from source.
   - Compile and run your application. If you use the DLL version of libusb-1.0,
     remember that you need to have a copy of the DLL either in the runtime
     directory or in system32
 
 o WDK/DDK:
   - The following is an example of a sources files that you can use to compile
-    a libusbx 1.0 based console application. In this sample ..\libusbx\ is the
+    a libusb 1.0 based console application. In this sample ..\libusb\ is the
     directory where you would have copied libusb.h as well as the relevant 
     libusb-1.0.lib
 
@@ -34,28 +34,28 @@ o WDK/DDK:
 	TARGETTYPE=PROGRAM
 	USE_MSVCRT=1
 	UMTYPE=console
-	INCLUDES=..\libusbx;$(DDK_INC_PATH)
-	TARGETLIBS=..\libusbx\libusb-1.0.lib
+	INCLUDES=..\libusb;$(DDK_INC_PATH)
+	TARGETLIBS=..\libusb\libusb-1.0.lib
 	SOURCES=your_app.c
 
   - Note that if you plan to use libCMT instead of MSVCRT (USE_LIBCMT=1 instead
-    of USE_MSVCRT=1), you will need to recompile libusbx to use libCMT. This can
+    of USE_MSVCRT=1), you will need to recompile libusb to use libCMT. This can
     easily be achieved, in the DDK environment, by running 'ddk_build /MT'
 
 o MinGW/cygwin
-  - Copy libusb.h, from include/libusbx-1.0/ to your default include directory,
+  - Copy libusb.h, from include/libusb-1.0/ to your default include directory,
     and copy the MinGW32/ or MinGW64/ .a files to your default library directory.
     Or, if you don't want to use the default locations, make sure that you feed
     the relevant -I and -L options to the compiler.
   - Add the '-lusb-1.0' linker option when compiling.
 
 o Additional information:
-  - The libusbx 1.0 API documentation can be accessed at:
-    http://api.libusbx.org
+  - The libusb 1.0 API documentation can be accessed at:
+    http://api.libusb.info
   - For some libusb samples (including source), please have a look in examples/
-  - For additional information on the libusbx 1.0 Windows backend please visit:
-    http://windows.libusbx.org
+  - For additional information on the libusb 1.0 Windows backend please visit:
+    http://windows.libusb.info
   - The MinGW and MS generated DLLs are fully interchangeable, provided that you
     use the import libs provided or generate one from the .def also provided.
-  - If you find any issue, please visit http://libusbx.org/ and check the
+  - If you find any issue, please visit http://libusb.info/ and check the
     Support section
diff --git a/.private/wbs_wince.txt b/.private/wbs_wince.txt
index ebd890d..5b5e3cb 100755
--- a/.private/wbs_wince.txt
+++ b/.private/wbs_wince.txt
@@ -1,8 +1,8 @@
-              libusbx 1.0 Windows CE binary snapshot - README
+              libusb 1.0 Windows CE binary snapshot - README
 
    *********************************************************************
    *  The latest version of this snapshot can always be downloaded at: *
-   *         https://sourceforge.net/projects/libusbx/files/           *
+   *         https://sourceforge.net/projects/libusb/files/           *
    *********************************************************************
 
 The binaries contained in this snapshot are licensed under the
@@ -12,7 +12,7 @@ is available for download at the same location as this binary snapshot.
 
 o Visual Studio:
   - Open existing or create a new project for your application
-  - Copy libusb.h, from the include\libusbx-1.0\ directory, into your project and
+  - Copy libusb.h, from the include\libusb-1.0\ directory, into your project and
     make sure that the location where the file reside appears in the 'Additional
     Include Directories' section (Configuration Properties -> C/C++ -> General).
   - Copy the relevant .lib file from ARMV4I, MIPSII, MIPSII_FP, MIPSIV, MIPSIV_FP,
@@ -20,23 +20,23 @@ o Visual Studio:
     (Configuration Properties -> Linker -> Input). Also make sure that the
     directory where libusb-1.0.lib resides is added to 'Additional Library
     Directories' (Configuration Properties -> Linker -> General)
-  - If you use the static version of the libusbx library, make sure that
+  - If you use the static version of the libusb library, make sure that
     'Runtime Library' is set to 'Multi-threaded DLL (/MD)' (Configuration
     Properties -> C/C++ -> Code Generation).
     NB: If your application requires /MT (Multi-threaded/libCMT), you need to
-    recompile a static libusbx 1.0 library from source.
+    recompile a static libusb 1.0 library from source.
   - Compile and run your application. If you use the DLL version of libusb-1.0,
     remember that you need to have a copy of the DLL either in the runtime
     directory or in system32
 
 o Additional information:
-  - The libusbx 1.0 API documentation can be accessed at:
-    http://api.libusbx.org
+  - The libusb 1.0 API documentation can be accessed at:
+    http://api.libusb.info
   - For some libusb samples (including source), please have a look in examples/
-  - For additional information on the libusbx 1.0 Windows backend please visit:
-    http://windows.libusbx.org
-  - It is necessary to install the CE USB Kernel Wrapper driver for libusbx to
+  - For additional information on the libusb 1.0 Windows backend please visit:
+    http://windows.libusb.info
+  - It is necessary to install the CE USB Kernel Wrapper driver for libusb to
     function on a device. This is obtainable from:
     https://github.com/RealVNC/CEUSBKWrapper
-  - If you find any issue, please visit http://libusbx.org/ and check the
+  - If you find any issue, please visit http://libusb.info/ and check the
     Support section
diff --git a/ChangeLog b/ChangeLog
index 05e08de..f47cfe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 For detailed information about the changes below, please see the git log or
-visit: http://log.libusbx.org
+visit: http://log.libusb.info
 
 2013-09-06: v1.0.17
 * Hotplug callbacks now always get passed a libusb_context, even if it is
@@ -11,11 +11,11 @@ visit: http://log.libusbx.org
 * Darwin: Add Xcode project
 * Darwin: Fix crash on unplug (#121)
 * Linux: Fix hang (deadlock) on libusb_exit
-* Linux: Fix libusbx build failure with --disable-udev (#124)
+* Linux: Fix libusb build failure with --disable-udev (#124)
 * Linux: Fix libusb_get_device_list() hang with --disable-udev (#130)
 * OpenBSD: Update OpenBSD backend with support for control transfers to
   non-ugen(4) devices and make get_configuration() no longer generate I/O.
-  Note that using this libusbx version on OpenBSD requires using
+  Note that using this libusb version on OpenBSD requires using
   OpenBSD 5.3-current or later. Users of older OpenBSD versions are advised
   to stay with the libusb shipped with OpenBSD (mpi)
 * Windows: fix libusb_dll_2010.vcxproj link errors (#129)
@@ -62,7 +62,7 @@ https://github.com/libusbx/libusbx/issues/9
 * Reverts the previous API change with regards to bMaxPower.
   If this doesn't matter to you, you are encouraged to keep using v1.0.13,
   as it will use the same attribute as v2.0, to be released soon.
-* Note that LIBUSBX_API_VERSION is *decreased* to 0x010000FF and the previous
+* Note that LIBUSB_API_VERSION is *decreased* to 0x010000FF and the previous
   guidelines with regards to concurrent use of MaxPower/bMaxPower still apply.
 
 2012-09-20: v1.0.13
@@ -73,11 +73,11 @@ https://github.com/libusbx/libusbx/issues/9
 * Fix broken support for the 0.1 -> 1.0 libusb-compat layer
 * Fix unwanted cancellation of pending timeouts as well as major timeout related bugs
 * Fix handling of HID and composite devices on Windows
-* Introduce LIBUSBX_API_VERSION macro
+* Introduce LIBUSB_API_VERSION macro
 * Add Cypress FX/FX2 firmware upload sample, based on fxload from
   http://linux-hotplug.sourceforge.net
 * Add libusb0 (libusb-win32) and libusbK driver support on Windows. Note that while
-  the drivers allow it, isochronous transfers are not supported yet in libusbx. Also
+  the drivers allow it, isochronous transfers are not supported yet in libusb. Also
   not supported yet is the use of libusb-win32 filter drivers on composite interfaces
 * Add support for the new get_capabilities ioctl on Linux and avoid unnecessary
   splitting of bulk transfers
@@ -178,18 +178,18 @@ https://github.com/libusbx/libusbx/issues/9
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 APPENDIX A - How to maintain code compatibility with versions of libusb and
-libusbx that use MaxPower:
+libusb that use MaxPower:
 
 If you must to maintain compatibility with versions of the library that aren't
 using the bMaxPower attribute in struct libusb_config_descriptor, the 
-recommended way is to use the new LIBUSBX_API_VERSION macro with an #ifdef.
+recommended way is to use the new LIBUSB_API_VERSION macro with an #ifdef.
 For instance, if your code was written as follows:
 
   if (dev->config[0].MaxPower < 250)
 
 Then you should modify it to have:
 
-#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01000100)
+#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000100)
   if (dev->config[0].bMaxPower < 250)
 #else
   if (dev->config[0].MaxPower < 250)
diff --git a/INSTALL_WIN.txt b/INSTALL_WIN.txt
index cef4976..9376dd5 100644
--- a/INSTALL_WIN.txt
+++ b/INSTALL_WIN.txt
@@ -5,10 +5,10 @@ If you are compiling for MinGW or cygwin, please refer to the INSTALL file.
 
 If you are using Microsoft Visual Studio:
 - Open the relevant solution file in /msvc:
-  libusb.dsw for MSVC6, libusbx_2005.sln for Visual Studio 2005 or 2008,
-  libusbx_2010.sln for Visual Studio 2010,
-  libusbx_2012.sln for Visual Studio 2012 or later,
-  libusbx_wince.sln for Windows CE support in Visual Studio 2005.
+  libusb.dsw for MSVC6, libusb_2005.sln for Visual Studio 2005 or 2008,
+  libusb_2010.sln for Visual Studio 2010,
+  libusb_2012.sln for Visual Studio 2012 or later,
+  libusb_wince.sln for Windows CE support in Visual Studio 2005.
 - If you want to debug the library, uncomment the ENABLE_DEBUG_LOGGING define
   in msvc\config.h
 - Select your configuration and compile the project
@@ -51,13 +51,13 @@ If needed, these libraries can be obtained by installing either the latest
 Windows SDK or the DDK (Links provided at the end of this file).
 
 For Windows CE it is necessary to install the CE USB Kernel Wrapper driver for
-libusbx to function on a device.
+libusb to function on a device.
 
 Links
 *****
 
 Additional information related to the Windows backend:
-  http://windows.libusbx.org
+  http://windows.libusb.info
 
 Latest Windows Driver (Development) Kit (WDK):
   http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=36a2630f-5d56-43b5-b996-7633f2ec14ff
diff --git a/NEWS b/NEWS
index 9c04694..07695ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-For the latest libusbx news, please refer to the ChangeLog file, or visit:
-http://libusbx.org
+For the latest libusb news, please refer to the ChangeLog file, or visit:
+http://libusb.info
diff --git a/PORTING b/PORTING
index 9185c37..fa9ec1e 100644
--- a/PORTING
+++ b/PORTING
@@ -1,15 +1,15 @@
-PORTING LIBUSBX TO OTHER PLATFORMS
+PORTING LIBUSB TO OTHER PLATFORMS
 
 Introduction
 ============
 
-This document is aimed at developers wishing to port libusbx to unsupported
-platforms. I believe the libusbx API is OS-independent, so by supporting
+This document is aimed at developers wishing to port libusb to unsupported
+platforms. I believe the libusb API is OS-independent, so by supporting
 multiple operating systems we pave the way for cross-platform USB device
 drivers.
 
 Implementation-wise, the basic idea is that you provide an interface to
-libusbx's internal "backend" API, which performs the appropriate operations on
+libusb's internal "backend" API, which performs the appropriate operations on
 your target platform.
 
 In terms of USB I/O, your backend provides functionality to submit
@@ -27,16 +27,16 @@ e.g. setting configuration, obtaining descriptors, etc.
 File descriptors for I/O polling
 ================================
 
-For libusbx to work, your event handling function obviously needs to be called
+For libusb to work, your event handling function obviously needs to be called
 at various points in time. Your backend must provide a set of file descriptors
-which libusbx and its users can pass to poll() or select() to determine when
+which libusb and its users can pass to poll() or select() to determine when
 it is time to call the event handling function.
 
 On Linux, this is easy: the usbfs kernel interface exposes a file descriptor
 which can be passed to poll(). If something similar is not true for your
 platform, you can emulate this using an internal library thread to reap I/O as
 necessary, and a pipe() with the main library to raise events. The file
-descriptor of the pipe can then be provided to libusbx as an event source.
+descriptor of the pipe can then be provided to libusb as an event source.
 
 
 Interface semantics and documentation
@@ -46,7 +46,7 @@ Documentation of the backend interface can be found in libusbi.h inside the
 usbi_os_backend structure definition.
 
 Your implementations of these functions will need to call various internal
-libusbx functions, prefixed with "usbi_". Documentation for these functions
+libusb functions, prefixed with "usbi_". Documentation for these functions
 can be found in the .c files where they are implemented.
 
 You probably want to skim over *all* the documentation before starting your
@@ -72,18 +72,18 @@ right usbi_backend for your platform.
 
 4. Produce and test your implementation.
 
-5. Send your implementation to libusbx-devel mailing list.
+5. Send your implementation to libusb-devel mailing list.
 
 
 Implementation difficulties? Questions?
 =======================================
 
-If you encounter difficulties porting libusbx to your platform, please raise
-these issues on the libusbx-devel mailing list. Where possible and sensible, I
-am interested in solving problems preventing libusbx from operating on other
+If you encounter difficulties porting libusb to your platform, please raise
+these issues on the libusb-devel mailing list. Where possible and sensible, I
+am interested in solving problems preventing libusb from operating on other
 platforms.
 
-The libusbx-devel mailing list is also a good place to ask questions and
+The libusb-devel mailing list is also a good place to ask questions and
 make suggestions about the internal API. Hopefully we can produce some
 better documentation based on your questions and other input.
 
diff --git a/README b/README
index 2ac89f9..715c416 100644
--- a/README
+++ b/README
@@ -1,25 +1,23 @@
-libusbx
-=======
+libusb
+======
 
-libusbx is a library for USB device access from Linux, Mac OS X,
-Windows and OpenBSD/NetBSD userspace, with OpenBSD/NetBSD, and to a
-lesser extent some of the newest features of Windows (such as libusbK
-and libusb-win32 driver support) being EXPERIMENTAL.
+libusb is a library for USB device access from Linux, Mac OS X,
+Windows and OpenBSD/NetBSD userspace.
 It is written in C and licensed under the GNU Lesser General Public
 License version 2.1 or, at your option, any later version (see COPYING).
 
-libusbx is abstracted internally in such a way that it can hopefully
+libusb is abstracted internally in such a way that it can hopefully
 be ported to other operating systems. Please see the PORTING file
 for more information.
 
-libusbx homepage:
-http://libusbx.org/
+libusb homepage:
+http://libusb.info/
 
 Developers will wish to consult the API documentation:
-http://api.libusbx.org
+http://api.libusb.info
 
 Use the mailing list for questions, comments, etc:
-http://mailing-list.libusbx.org
+http://mailing-list.libusb.info
 
 - Pete Batard <pete@akeo.ie>
 - Hans de Goede <hdegoede@redhat.com>
diff --git a/README.git b/README.git
index 6f3cef1..eab938c 100644
--- a/README.git
+++ b/README.git
@@ -1,7 +1,7 @@
 Notes related to git compilation:
 --------------------------------
 
-If you retrieved the libusbx repository from git and are using a gcc based
+If you retrieved the libusb repository from git and are using a gcc based
 toolchain, be mindful that you should have the autotools installed (autoconf,
 automake) and will need to run either ./autogen.sh or ./bootstrap.sh to produce
 the configure file.
@@ -22,20 +22,20 @@ libtoolize or glibtoolize was not found! Please install libtool.
 
 To proceed, you must find and install it from somewhere.
 
-Alternatively, you can use the Xcode project at Xcode/libusbx.xcodeproj.
+Alternatively, you can use the Xcode project at Xcode/libusb.xcodeproj.
 
 Notes related to submitting new developments:
 --------------------------------------------
 
-If you submit a new development to libusbx (eg: new backend), that is unlikely
+If you submit a new development to libusb (eg: new backend), that is unlikely
 to fit in a couple of small patches, we would kindly suggest that you create a
 public account on github, if you don't have one already, and then fork a new
-libusbx repository under this account from https://github.com/libusbx/libusbx.
+libusb repository under this account from https://github.com/libusb/libusb.
 
 Then you can create a git branch for your work, that we will be able to better
 reference and test. 
 
 We also suggest that, if you are planning to bring in a large development, you
-try to involve the libusbx community early by letting the mailing list know, as
+try to involve the libusb community early by letting the mailing list know, as
 you may find that other people might be eager to help you out. 
-See http://mailing-list.libusbx.org for details on how to join the mailing list.
-\ No newline at end of file
+See http://mailing-list.libusb.info for details on how to join the mailing list.
+\ No newline at end of file
diff --git a/TODO b/TODO
index e64b279..19dd1d0 100644
--- a/TODO
+++ b/TODO
@@ -1,2 +1,2 @@
-Please see the libusbx roadmap by visiting:
-https://github.com/libusbx/libusbx/issues/milestones?direction=asc&sort=due_date
-\ No newline at end of file
+Please see the libusb roadmap by visiting:
+https://github.com/libusb/libusb/issues/milestones?direction=asc&sort=due_date
diff --git a/Xcode/common.xcconfig b/Xcode/common.xcconfig
index f64cd6d..23ed148 100644
--- a/Xcode/common.xcconfig
+++ b/Xcode/common.xcconfig
@@ -1,7 +1,7 @@
 //
-// libusbx Xcode configuration file
+// libusb Xcode configuration file
 // Copyright © 2012 Pete Batard <pete@akeo.ie>
-// For more information, please visit: <http://libusbx.org>
+// For more information, please visit: <http://libusb.info>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-// libusbx does not follow C99 strict aliasing rules, so disable it.
+// libusb does not follow C99 strict aliasing rules, so disable it.
 GCC_STRICT_ALIASING = NO
 
 // Use C99 dialect.
diff --git a/Xcode/debug.xcconfig b/Xcode/debug.xcconfig
index 73dc083..e910ee8 100644
--- a/Xcode/debug.xcconfig
+++ b/Xcode/debug.xcconfig
@@ -1,7 +1,7 @@
 //
-// libusbx Xcode configuration file
+// libusb Xcode configuration file
 // Copyright © 2012 Pete Batard <pete@akeo.ie>
-// For more information, please visit: <http://libusbx.org>
+// For more information, please visit: <http://libusb.info>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/Xcode/libusbx.xcconfig b/Xcode/libusb.xcconfig
index 9c6385a..b50fa94 100644
--- a/Xcode/libusbx.xcconfig
+++ b/Xcode/libusb.xcconfig
@@ -1,7 +1,7 @@
 //
-// libusbx Xcode configuration file
+// libusb Xcode configuration file
 // Copyright © 2012 Pete Batard <pete@akeo.ie>
-// For more information, please visit: <http://libusbx.org>
+// For more information, please visit: <http://libusb.info>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/Xcode/libusb.xcodeproj/project.pbxproj b/Xcode/libusb.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..a5aeb10
--- /dev/null
+++ b/Xcode/libusb.xcodeproj/project.pbxproj
@@ -0,0 +1 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+/* Begin PBXAggregateTarget section */
+		008FC0321628BC9400BC5BE2 /* all */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 008FC0331628BC9400BC5BE2 /* Build configuration list for PBXAggregateTarget "all" */;
+			buildPhases = (
+			);
+			dependencies = (
+				008FC0371628BC9A00BC5BE2 /* PBXTargetDependency */,
+				008FC0391628BC9A00BC5BE2 /* PBXTargetDependency */,
+				008FC03B1628BC9A00BC5BE2 /* PBXTargetDependency */,
+				008FC03D1628BC9A00BC5BE2 /* PBXTargetDependency */,
+				008FC03F1628BC9A00BC5BE2 /* PBXTargetDependency */,
+				008FC0411628BC9A00BC5BE2 /* PBXTargetDependency */,
+			);
+			name = all;
+			productName = all;
+		};
+/* End PBXAggregateTarget section */
+/* Begin PBXBuildFile section */
+		008FBF861628B7E800BC5BE2 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF541628B7E800BC5BE2 /* core.c */; };
+		008FBF871628B7E800BC5BE2 /* descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF551628B7E800BC5BE2 /* descriptor.c */; };
+		008FBF881628B7E800BC5BE2 /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF561628B7E800BC5BE2 /* io.c */; };
+		008FBF891628B7E800BC5BE2 /* libusb.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF5A1628B7E800BC5BE2 /* libusb.h */; };
+		008FBF901628B7E800BC5BE2 /* libusbi.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF671628B7E800BC5BE2 /* libusbi.h */; };
+		008FBF921628B7E800BC5BE2 /* darwin_usb.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF6C1628B7E800BC5BE2 /* darwin_usb.c */; };
+		008FBF931628B7E800BC5BE2 /* darwin_usb.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF6D1628B7E800BC5BE2 /* darwin_usb.h */; };
+		008FBF971628B7E800BC5BE2 /* poll_posix.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF711628B7E800BC5BE2 /* poll_posix.h */; };
+		008FBF9A1628B7E800BC5BE2 /* threads_posix.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF741628B7E800BC5BE2 /* threads_posix.c */; };
+		008FBF9B1628B7E800BC5BE2 /* threads_posix.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF751628B7E800BC5BE2 /* threads_posix.h */; };
+		008FBFA01628B7E800BC5BE2 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF7A1628B7E800BC5BE2 /* sync.c */; };
+		008FBFA11628B7E800BC5BE2 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF7B1628B7E800BC5BE2 /* version.h */; };
+		008FBFA21628B7E800BC5BE2 /* version_nano.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF7C1628B7E800BC5BE2 /* version_nano.h */; };
+		008FBFA51628B84200BC5BE2 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBFA41628B84200BC5BE2 /* config.h */; };
+		008FBFA71628B87000BC5BE2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBFA61628B87000BC5BE2 /* CoreFoundation.framework */; };
+		008FBFA91628B88000BC5BE2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBFA81628B88000BC5BE2 /* IOKit.framework */; };
+		008FBFAB1628B8CB00BC5BE2 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBFAA1628B8CB00BC5BE2 /* libobjc.dylib */; };
+		008FBFEF1628BA3500BC5BE2 /* xusb.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFED1628BA0E00BC5BE2 /* xusb.c */; };
+		008FBFF01628BA3A00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
+		008FBFFF1628BB9600BC5BE2 /* dpfp.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFD71628BA0E00BC5BE2 /* dpfp.c */; };
+		008FC0001628BBCD00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
+		008FC00F1628BBE400BC5BE2 /* dpfp_threaded.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFDB1628BA0E00BC5BE2 /* dpfp_threaded.c */; };
+		008FC0101628BBE900BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
+		008FC01F1628BC1500BC5BE2 /* fxload.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFE11628BA0E00BC5BE2 /* fxload.c */; };
+		008FC0201628BC1B00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
+		008FC0211628BC5200BC5BE2 /* ezusb.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFDC1628BA0E00BC5BE2 /* ezusb.c */; };
+		008FC0301628BC7400BC5BE2 /* listdevs.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFE71628BA0E00BC5BE2 /* listdevs.c */; };
+		008FC0311628BC7800BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
+		1438D77A17A2ED9F00166101 /* hotplug.c in Sources */ = {isa = PBXBuildFile; fileRef = 1438D77817A2ED9F00166101 /* hotplug.c */; };
+		1438D77B17A2ED9F00166101 /* hotplug.h in Headers */ = {isa = PBXBuildFile; fileRef = 1438D77917A2ED9F00166101 /* hotplug.h */; };
+		1438D77D17A2EDCD00166101 /* poll_posix.c in Sources */ = {isa = PBXBuildFile; fileRef = 1438D77C17A2EDCD00166101 /* poll_posix.c */; };
+		1438D77F17A2F0EA00166101 /* strerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1438D77E17A2F0EA00166101 /* strerror.c */; };
+/* End PBXBuildFile section */
+/* Begin PBXContainerItemProxy section */
+		008FC0361628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
+			remoteInfo = libusb;
+		};
+		008FC0381628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBFBC1628B9FE00BC5BE2;
+			remoteInfo = xusb;
+		};
+		008FC03A1628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBFF41628BB8B00BC5BE2;
+			remoteInfo = dpfp;
+		};
+		008FC03C1628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FC0041628BBDB00BC5BE2;
+			remoteInfo = dpfp_threaded;
+		};
+		008FC03E1628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FC0141628BC0300BC5BE2;
+			remoteInfo = fxload;
+		};
+		008FC0401628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FC0251628BC6B00BC5BE2;
+			remoteInfo = listdevs;
+		};
+		1443EE8B1641926D007E0579 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
+			remoteInfo = libusb;
+		};
+		1443EE8D16419273007E0579 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
+			remoteInfo = libusb;
+		};
+		1443EE8F16419276007E0579 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
+			remoteInfo = libusb;
+		};
+		1443EE911641927A007E0579 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
+			remoteInfo = libusb;
+		};
+		1443EE931641927D007E0579 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
+			remoteInfo = libusb;
+		};
+/* End PBXContainerItemProxy section */
+/* Begin PBXCopyFilesBuildPhase section */
+		008FBFBB1628B9FE00BC5BE2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		008FBFF31628BB8B00BC5BE2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		008FC0031628BBDB00BC5BE2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		008FC0131628BC0300BC5BE2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		008FC0241628BC6B00BC5BE2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+/* Begin PBXFileReference section */
+		008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libusb-1.0.0.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		008FBF541628B7E800BC5BE2 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = "<group>"; };
+		008FBF551628B7E800BC5BE2 /* descriptor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = descriptor.c; sourceTree = "<group>"; };
+		008FBF561628B7E800BC5BE2 /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
+		008FBF5A1628B7E800BC5BE2 /* libusb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libusb.h; sourceTree = "<group>"; };
+		008FBF671628B7E800BC5BE2 /* libusbi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libusbi.h; sourceTree = "<group>"; };
+		008FBF6C1628B7E800BC5BE2 /* darwin_usb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = darwin_usb.c; sourceTree = "<group>"; };
+		008FBF6D1628B7E800BC5BE2 /* darwin_usb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = darwin_usb.h; sourceTree = "<group>"; };
+		008FBF711628B7E800BC5BE2 /* poll_posix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = poll_posix.h; sourceTree = "<group>"; };
+		008FBF741628B7E800BC5BE2 /* threads_posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = threads_posix.c; sourceTree = "<group>"; };
+		008FBF751628B7E800BC5BE2 /* threads_posix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threads_posix.h; sourceTree = "<group>"; };
+		008FBF7A1628B7E800BC5BE2 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sync.c; sourceTree = "<group>"; };
+		008FBF7B1628B7E800BC5BE2 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
+		008FBF7C1628B7E800BC5BE2 /* version_nano.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version_nano.h; sourceTree = "<group>"; };
+		008FBFA41628B84200BC5BE2 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		008FBFA61628B87000BC5BE2 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		008FBFA81628B88000BC5BE2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+		008FBFAA1628B8CB00BC5BE2 /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = usr/lib/libobjc.dylib; sourceTree = SDKROOT; };
+		008FBFBD1628B9FE00BC5BE2 /* xusb */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xusb; sourceTree = BUILT_PRODUCTS_DIR; };
+		008FBFD71628BA0E00BC5BE2 /* dpfp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dpfp.c; sourceTree = "<group>"; };
+		008FBFDB1628BA0E00BC5BE2 /* dpfp_threaded.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dpfp_threaded.c; sourceTree = "<group>"; };
+		008FBFDC1628BA0E00BC5BE2 /* ezusb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ezusb.c; sourceTree = "<group>"; };
+		008FBFDD1628BA0E00BC5BE2 /* ezusb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ezusb.h; sourceTree = "<group>"; };
+		008FBFE11628BA0E00BC5BE2 /* fxload.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fxload.c; sourceTree = "<group>"; };
+		008FBFE71628BA0E00BC5BE2 /* listdevs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = listdevs.c; sourceTree = "<group>"; };
+		008FBFED1628BA0E00BC5BE2 /* xusb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xusb.c; sourceTree = "<group>"; };
+		008FBFF51628BB8B00BC5BE2 /* dpfp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dpfp; sourceTree = BUILT_PRODUCTS_DIR; };
+		008FC0051628BBDB00BC5BE2 /* dpfp_threaded */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dpfp_threaded; sourceTree = BUILT_PRODUCTS_DIR; };
+		008FC0151628BC0300BC5BE2 /* fxload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fxload; sourceTree = BUILT_PRODUCTS_DIR; };
+		008FC0261628BC6B00BC5BE2 /* listdevs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = listdevs; sourceTree = BUILT_PRODUCTS_DIR; };
+		1438D77817A2ED9F00166101 /* hotplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotplug.c; sourceTree = "<group>"; };
+		1438D77917A2ED9F00166101 /* hotplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotplug.h; sourceTree = "<group>"; };
+		1438D77C17A2EDCD00166101 /* poll_posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poll_posix.c; sourceTree = "<group>"; };
+		1438D77E17A2F0EA00166101 /* strerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strerror.c; sourceTree = "<group>"; };
+		1443EE8416417E63007E0579 /* common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = SOURCE_ROOT; };
+		1443EE8516417E63007E0579 /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = SOURCE_ROOT; };
+		1443EE8616417E63007E0579 /* libusb_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libusb_debug.xcconfig; sourceTree = SOURCE_ROOT; };
+		1443EE8716417E63007E0579 /* libusb.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libusb.xcconfig; sourceTree = SOURCE_ROOT; };
+		1443EE8816417E63007E0579 /* release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = SOURCE_ROOT; };
+		1443EE8916417EA6007E0579 /* libusb_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libusb_release.xcconfig; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+/* Begin PBXFrameworksBuildPhase section */
+		008FBF2E1628B79300BC5BE2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FBFAB1628B8CB00BC5BE2 /* libobjc.dylib in Frameworks */,
+				008FBFA91628B88000BC5BE2 /* IOKit.framework in Frameworks */,
+				008FBFA71628B87000BC5BE2 /* CoreFoundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FBFBA1628B9FE00BC5BE2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FBFF01628BA3A00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FBFF21628BB8B00BC5BE2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC0001628BBCD00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FC0021628BBDB00BC5BE2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC0101628BBE900BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FC0121628BC0300BC5BE2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC0201628BC1B00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FC0231628BC6B00BC5BE2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC0311628BC7800BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+/* Begin PBXGroup section */
+		008FBF261628B79300BC5BE2 = {
+			isa = PBXGroup;
+			children = (
+				1443EE8316417DE3007E0579 /* xcconfig */,
+				008FBFA41628B84200BC5BE2 /* config.h */,
+				008FBF3B1628B7E800BC5BE2 /* libusb */,
+				008FBFC81628BA0E00BC5BE2 /* examples */,
+				1443EE8A16419057007E0579 /* Apple */,
+				008FBF321628B79300BC5BE2 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		008FBF321628B79300BC5BE2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */,
+				008FBFBD1628B9FE00BC5BE2 /* xusb */,
+				008FBFF51628BB8B00BC5BE2 /* dpfp */,
+				008FC0051628BBDB00BC5BE2 /* dpfp_threaded */,
+				008FC0151628BC0300BC5BE2 /* fxload */,
+				008FC0261628BC6B00BC5BE2 /* listdevs */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		008FBF3B1628B7E800BC5BE2 /* libusb */ = {
+			isa = PBXGroup;
+			children = (
+				008FBF541628B7E800BC5BE2 /* core.c */,
+				008FBF551628B7E800BC5BE2 /* descriptor.c */,
+				1438D77817A2ED9F00166101 /* hotplug.c */,
+				1438D77917A2ED9F00166101 /* hotplug.h */,
+				008FBF561628B7E800BC5BE2 /* io.c */,
+				008FBF5A1628B7E800BC5BE2 /* libusb.h */,
+				008FBF671628B7E800BC5BE2 /* libusbi.h */,
+				008FBF6B1628B7E800BC5BE2 /* os */,
+				1438D77E17A2F0EA00166101 /* strerror.c */,
+				008FBF7A1628B7E800BC5BE2 /* sync.c */,
+				008FBF7B1628B7E800BC5BE2 /* version.h */,
+				008FBF7C1628B7E800BC5BE2 /* version_nano.h */,
+			);
+			name = libusb;
+			path = ../libusb;
+			sourceTree = "<group>";
+		};
+		008FBF6B1628B7E800BC5BE2 /* os */ = {
+			isa = PBXGroup;
+			children = (
+				008FBF6C1628B7E800BC5BE2 /* darwin_usb.c */,
+				008FBF6D1628B7E800BC5BE2 /* darwin_usb.h */,
+				1438D77C17A2EDCD00166101 /* poll_posix.c */,
+				008FBF711628B7E800BC5BE2 /* poll_posix.h */,
+				008FBF741628B7E800BC5BE2 /* threads_posix.c */,
+				008FBF751628B7E800BC5BE2 /* threads_posix.h */,
+			);
+			path = os;
+			sourceTree = "<group>";
+		};
+		008FBFC81628BA0E00BC5BE2 /* examples */ = {
+			isa = PBXGroup;
+			children = (
+				008FBFD71628BA0E00BC5BE2 /* dpfp.c */,
+				008FBFDB1628BA0E00BC5BE2 /* dpfp_threaded.c */,
+				008FBFDC1628BA0E00BC5BE2 /* ezusb.c */,
+				008FBFE11628BA0E00BC5BE2 /* fxload.c */,
+				008FBFE71628BA0E00BC5BE2 /* listdevs.c */,
+				008FBFED1628BA0E00BC5BE2 /* xusb.c */,
+				008FBFDD1628BA0E00BC5BE2 /* ezusb.h */,
+			);
+			name = examples;
+			path = ../examples;
+			sourceTree = "<group>";
+		};
+		1443EE8316417DE3007E0579 /* xcconfig */ = {
+			isa = PBXGroup;
+			children = (
+				1443EE8416417E63007E0579 /* common.xcconfig */,
+				1443EE8516417E63007E0579 /* debug.xcconfig */,
+				1443EE8816417E63007E0579 /* release.xcconfig */,
+				1443EE8716417E63007E0579 /* libusb.xcconfig */,
+				1443EE8616417E63007E0579 /* libusb_debug.xcconfig */,
+				1443EE8916417EA6007E0579 /* libusb_release.xcconfig */,
+			);
+			name = xcconfig;
+			path = ../libusb;
+			sourceTree = "<group>";
+		};
+		1443EE8A16419057007E0579 /* Apple */ = {
+			isa = PBXGroup;
+			children = (
+				008FBFAA1628B8CB00BC5BE2 /* libobjc.dylib */,
+				008FBFA81628B88000BC5BE2 /* IOKit.framework */,
+				008FBFA61628B87000BC5BE2 /* CoreFoundation.framework */,
+			);
+			name = Apple;
+			path = ../libusb;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+/* Begin PBXHeadersBuildPhase section */
+		008FBF2F1628B79300BC5BE2 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FBF891628B7E800BC5BE2 /* libusb.h in Headers */,
+				008FBF901628B7E800BC5BE2 /* libusbi.h in Headers */,
+				008FBF931628B7E800BC5BE2 /* darwin_usb.h in Headers */,
+				008FBF971628B7E800BC5BE2 /* poll_posix.h in Headers */,
+				008FBF9B1628B7E800BC5BE2 /* threads_posix.h in Headers */,
+				008FBFA11628B7E800BC5BE2 /* version.h in Headers */,
+				008FBFA21628B7E800BC5BE2 /* version_nano.h in Headers */,
+				008FBFA51628B84200BC5BE2 /* config.h in Headers */,
+				1438D77B17A2ED9F00166101 /* hotplug.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+/* Begin PBXNativeTarget section */
+		008FBF301628B79300BC5BE2 /* libusb */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 008FBF351628B79300BC5BE2 /* Build configuration list for PBXNativeTarget "libusb" */;
+			buildPhases = (
+				008FBF2D1628B79300BC5BE2 /* Sources */,
+				008FBF2E1628B79300BC5BE2 /* Frameworks */,
+				008FBF2F1628B79300BC5BE2 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libusb;
+			productName = libusb;
+			productReference = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		008FBFBC1628B9FE00BC5BE2 /* xusb */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 008FBFC61628B9FE00BC5BE2 /* Build configuration list for PBXNativeTarget "xusb" */;
+			buildPhases = (
+				008FBFB91628B9FE00BC5BE2 /* Sources */,
+				008FBFBA1628B9FE00BC5BE2 /* Frameworks */,
+				008FBFBB1628B9FE00BC5BE2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1443EE941641927D007E0579 /* PBXTargetDependency */,
+			);
+			name = xusb;
+			productName = xusb;
+			productReference = 008FBFBD1628B9FE00BC5BE2 /* xusb */;
+			productType = "com.apple.product-type.tool";
+		};
+		008FBFF41628BB8B00BC5BE2 /* dpfp */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 008FBFFC1628BB8C00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp" */;
+			buildPhases = (
+				008FBFF11628BB8B00BC5BE2 /* Sources */,
+				008FBFF21628BB8B00BC5BE2 /* Frameworks */,
+				008FBFF31628BB8B00BC5BE2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1443EE921641927A007E0579 /* PBXTargetDependency */,
+			);
+			name = dpfp;
+			productName = dpfp;
+			productReference = 008FBFF51628BB8B00BC5BE2 /* dpfp */;
+			productType = "com.apple.product-type.tool";
+		};
+		008FC0041628BBDB00BC5BE2 /* dpfp_threaded */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 008FC00C1628BBDB00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp_threaded" */;
+			buildPhases = (
+				008FC0011628BBDB00BC5BE2 /* Sources */,
+				008FC0021628BBDB00BC5BE2 /* Frameworks */,
+				008FC0031628BBDB00BC5BE2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1443EE9016419276007E0579 /* PBXTargetDependency */,
+			);
+			name = dpfp_threaded;
+			productName = dpfp_threaded;
+			productReference = 008FC0051628BBDB00BC5BE2 /* dpfp_threaded */;
+			productType = "com.apple.product-type.tool";
+		};
+		008FC0141628BC0300BC5BE2 /* fxload */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 008FC01C1628BC0300BC5BE2 /* Build configuration list for PBXNativeTarget "fxload" */;
+			buildPhases = (
+				008FC0111628BC0300BC5BE2 /* Sources */,
+				008FC0121628BC0300BC5BE2 /* Frameworks */,
+				008FC0131628BC0300BC5BE2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1443EE8E16419273007E0579 /* PBXTargetDependency */,
+			);
+			name = fxload;
+			productName = fxload;
+			productReference = 008FC0151628BC0300BC5BE2 /* fxload */;
+			productType = "com.apple.product-type.tool";
+		};
+		008FC0251628BC6B00BC5BE2 /* listdevs */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 008FC02D1628BC6B00BC5BE2 /* Build configuration list for PBXNativeTarget "listdevs" */;
+			buildPhases = (
+				008FC0221628BC6B00BC5BE2 /* Sources */,
+				008FC0231628BC6B00BC5BE2 /* Frameworks */,
+				008FC0241628BC6B00BC5BE2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1443EE8C1641926D007E0579 /* PBXTargetDependency */,
+			);
+			name = listdevs;
+			productName = listdevs;
+			productReference = 008FC0261628BC6B00BC5BE2 /* listdevs */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+/* Begin PBXProject section */
+		008FBF281628B79300BC5BE2 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0450;
+				ORGANIZATIONNAME = libusb;
+			};
+			buildConfigurationList = 008FBF2B1628B79300BC5BE2 /* Build configuration list for PBXProject "libusb" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 008FBF261628B79300BC5BE2;
+			productRefGroup = 008FBF321628B79300BC5BE2 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				008FBF301628B79300BC5BE2 /* libusb */,
+				008FBFBC1628B9FE00BC5BE2 /* xusb */,
+				008FBFF41628BB8B00BC5BE2 /* dpfp */,
+				008FC0041628BBDB00BC5BE2 /* dpfp_threaded */,
+				008FC0141628BC0300BC5BE2 /* fxload */,
+				008FC0251628BC6B00BC5BE2 /* listdevs */,
+				008FC0321628BC9400BC5BE2 /* all */,
+			);
+		};
+/* End PBXProject section */
+/* Begin PBXSourcesBuildPhase section */
+		008FBF2D1628B79300BC5BE2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FBF861628B7E800BC5BE2 /* core.c in Sources */,
+				008FBF871628B7E800BC5BE2 /* descriptor.c in Sources */,
+				008FBF881628B7E800BC5BE2 /* io.c in Sources */,
+				008FBF921628B7E800BC5BE2 /* darwin_usb.c in Sources */,
+				008FBF9A1628B7E800BC5BE2 /* threads_posix.c in Sources */,
+				008FBFA01628B7E800BC5BE2 /* sync.c in Sources */,
+				1438D77A17A2ED9F00166101 /* hotplug.c in Sources */,
+				1438D77D17A2EDCD00166101 /* poll_posix.c in Sources */,
+				1438D77F17A2F0EA00166101 /* strerror.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FBFB91628B9FE00BC5BE2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FBFEF1628BA3500BC5BE2 /* xusb.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FBFF11628BB8B00BC5BE2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FBFFF1628BB9600BC5BE2 /* dpfp.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FC0011628BBDB00BC5BE2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC00F1628BBE400BC5BE2 /* dpfp_threaded.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FC0111628BC0300BC5BE2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC0211628BC5200BC5BE2 /* ezusb.c in Sources */,
+				008FC01F1628BC1500BC5BE2 /* fxload.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		008FC0221628BC6B00BC5BE2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				008FC0301628BC7400BC5BE2 /* listdevs.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+/* Begin PBXTargetDependency section */
+		008FC0371628BC9A00BC5BE2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBF301628B79300BC5BE2 /* libusb */;
+			targetProxy = 008FC0361628BC9A00BC5BE2 /* PBXContainerItemProxy */;
+		};
+		008FC0391628BC9A00BC5BE2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBFBC1628B9FE00BC5BE2 /* xusb */;
+			targetProxy = 008FC0381628BC9A00BC5BE2 /* PBXContainerItemProxy */;
+		};
+		008FC03B1628BC9A00BC5BE2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBFF41628BB8B00BC5BE2 /* dpfp */;
+			targetProxy = 008FC03A1628BC9A00BC5BE2 /* PBXContainerItemProxy */;
+		};
+		008FC03D1628BC9A00BC5BE2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FC0041628BBDB00BC5BE2 /* dpfp_threaded */;
+			targetProxy = 008FC03C1628BC9A00BC5BE2 /* PBXContainerItemProxy */;
+		};
+		008FC03F1628BC9A00BC5BE2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FC0141628BC0300BC5BE2 /* fxload */;
+			targetProxy = 008FC03E1628BC9A00BC5BE2 /* PBXContainerItemProxy */;
+		};
+		008FC0411628BC9A00BC5BE2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FC0251628BC6B00BC5BE2 /* listdevs */;
+			targetProxy = 008FC0401628BC9A00BC5BE2 /* PBXContainerItemProxy */;
+		};
+		1443EE8C1641926D007E0579 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBF301628B79300BC5BE2 /* libusb */;
+			targetProxy = 1443EE8B1641926D007E0579 /* PBXContainerItemProxy */;
+		};
+		1443EE8E16419273007E0579 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBF301628B79300BC5BE2 /* libusb */;
+			targetProxy = 1443EE8D16419273007E0579 /* PBXContainerItemProxy */;
+		};
+		1443EE9016419276007E0579 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBF301628B79300BC5BE2 /* libusb */;
+			targetProxy = 1443EE8F16419276007E0579 /* PBXContainerItemProxy */;
+		};
+		1443EE921641927A007E0579 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBF301628B79300BC5BE2 /* libusb */;
+			targetProxy = 1443EE911641927A007E0579 /* PBXContainerItemProxy */;
+		};
+		1443EE941641927D007E0579 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 008FBF301628B79300BC5BE2 /* libusb */;
+			targetProxy = 1443EE931641927D007E0579 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+/* Begin XCBuildConfiguration section */
+		008FBF331628B79300BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		008FBF341628B79300BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		008FBF361628B79300BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8616417E63007E0579 /* libusb_debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		008FBF371628B79300BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8916417EA6007E0579 /* libusb_release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		008FBFC41628B9FE00BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		008FBFC51628B9FE00BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		008FBFFD1628BB8C00BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		008FBFFE1628BB8C00BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		008FC00D1628BBDB00BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		008FC00E1628BBDB00BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		008FC01D1628BC0300BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		008FC01E1628BC0300BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		008FC02E1628BC6B00BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		008FC02F1628BC6B00BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		008FC0341628BC9400BC5BE2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		008FC0351628BC9400BC5BE2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+/* Begin XCConfigurationList section */
+		008FBF2B1628B79300BC5BE2 /* Build configuration list for PBXProject "libusb" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FBF331628B79300BC5BE2 /* Debug */,
+				008FBF341628B79300BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FBF351628B79300BC5BE2 /* Build configuration list for PBXNativeTarget "libusb" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FBF361628B79300BC5BE2 /* Debug */,
+				008FBF371628B79300BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FBFC61628B9FE00BC5BE2 /* Build configuration list for PBXNativeTarget "xusb" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FBFC41628B9FE00BC5BE2 /* Debug */,
+				008FBFC51628B9FE00BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FBFFC1628BB8C00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FBFFD1628BB8C00BC5BE2 /* Debug */,
+				008FBFFE1628BB8C00BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FC00C1628BBDB00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp_threaded" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FC00D1628BBDB00BC5BE2 /* Debug */,
+				008FC00E1628BBDB00BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FC01C1628BC0300BC5BE2 /* Build configuration list for PBXNativeTarget "fxload" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FC01D1628BC0300BC5BE2 /* Debug */,
+				008FC01E1628BC0300BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FC02D1628BC6B00BC5BE2 /* Build configuration list for PBXNativeTarget "listdevs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FC02E1628BC6B00BC5BE2 /* Debug */,
+				008FC02F1628BC6B00BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		008FC0331628BC9400BC5BE2 /* Build configuration list for PBXAggregateTarget "all" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				008FC0341628BC9400BC5BE2 /* Debug */,
+				008FC0351628BC9400BC5BE2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 008FBF281628B79300BC5BE2 /* Project object */;
+}
+\ No newline at end of file
diff --git a/Xcode/libusbx_debug.xcconfig b/Xcode/libusb_debug.xcconfig
index 9144bc2..11bc4c3 100644
--- a/Xcode/libusbx_debug.xcconfig
+++ b/Xcode/libusb_debug.xcconfig
@@ -1,7 +1,7 @@
 //
-// libusbx Xcode configuration file
+// libusb Xcode configuration file
 // Copyright © 2012 Pete Batard <pete@akeo.ie>
-// For more information, please visit: <http://libusbx.org>
+// For more information, please visit: <http://libusb.info>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -18,4 +18,4 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #include "debug.xcconfig"
-#include "libusbx.xcconfig"
+#include "libusb.xcconfig"
diff --git a/Xcode/libusbx_release.xcconfig b/Xcode/libusb_release.xcconfig
index 83e36af..3bd47bb 100644
--- a/Xcode/libusbx_release.xcconfig
+++ b/Xcode/libusb_release.xcconfig
@@ -1,7 +1,7 @@
 //
-// libusbx Xcode configuration file
+// libusb Xcode configuration file
 // Copyright © 2012 Pete Batard <pete@akeo.ie>
-// For more information, please visit: <http://libusbx.org>
+// For more information, please visit: <http://libusb.info>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -18,4 +18,4 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #include "release.xcconfig"
-#include "libusbx.xcconfig"
+#include "libusb.xcconfig"
diff --git a/Xcode/libusbx.xcodeproj/project.pbxproj b/Xcode/libusbx.xcodeproj/project.pbxproj
deleted file mode 100644
index 288c0bf..0000000
--- a/Xcode/libusbx.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,864 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		008FC0321628BC9400BC5BE2 /* all */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 008FC0331628BC9400BC5BE2 /* Build configuration list for PBXAggregateTarget "all" */;
-			buildPhases = (
-			);
-			dependencies = (
-				008FC0371628BC9A00BC5BE2 /* PBXTargetDependency */,
-				008FC0391628BC9A00BC5BE2 /* PBXTargetDependency */,
-				008FC03B1628BC9A00BC5BE2 /* PBXTargetDependency */,
-				008FC03D1628BC9A00BC5BE2 /* PBXTargetDependency */,
-				008FC03F1628BC9A00BC5BE2 /* PBXTargetDependency */,
-				008FC0411628BC9A00BC5BE2 /* PBXTargetDependency */,
-			);
-			name = all;
-			productName = all;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		008FBF861628B7E800BC5BE2 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF541628B7E800BC5BE2 /* core.c */; };
-		008FBF871628B7E800BC5BE2 /* descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF551628B7E800BC5BE2 /* descriptor.c */; };
-		008FBF881628B7E800BC5BE2 /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF561628B7E800BC5BE2 /* io.c */; };
-		008FBF891628B7E800BC5BE2 /* libusb.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF5A1628B7E800BC5BE2 /* libusb.h */; };
-		008FBF901628B7E800BC5BE2 /* libusbi.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF671628B7E800BC5BE2 /* libusbi.h */; };
-		008FBF921628B7E800BC5BE2 /* darwin_usb.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF6C1628B7E800BC5BE2 /* darwin_usb.c */; };
-		008FBF931628B7E800BC5BE2 /* darwin_usb.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF6D1628B7E800BC5BE2 /* darwin_usb.h */; };
-		008FBF971628B7E800BC5BE2 /* poll_posix.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF711628B7E800BC5BE2 /* poll_posix.h */; };
-		008FBF9A1628B7E800BC5BE2 /* threads_posix.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF741628B7E800BC5BE2 /* threads_posix.c */; };
-		008FBF9B1628B7E800BC5BE2 /* threads_posix.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF751628B7E800BC5BE2 /* threads_posix.h */; };
-		008FBFA01628B7E800BC5BE2 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBF7A1628B7E800BC5BE2 /* sync.c */; };
-		008FBFA11628B7E800BC5BE2 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF7B1628B7E800BC5BE2 /* version.h */; };
-		008FBFA21628B7E800BC5BE2 /* version_nano.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBF7C1628B7E800BC5BE2 /* version_nano.h */; };
-		008FBFA51628B84200BC5BE2 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FBFA41628B84200BC5BE2 /* config.h */; };
-		008FBFA71628B87000BC5BE2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBFA61628B87000BC5BE2 /* CoreFoundation.framework */; };
-		008FBFA91628B88000BC5BE2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBFA81628B88000BC5BE2 /* IOKit.framework */; };
-		008FBFAB1628B8CB00BC5BE2 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBFAA1628B8CB00BC5BE2 /* libobjc.dylib */; };
-		008FBFEF1628BA3500BC5BE2 /* xusb.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFED1628BA0E00BC5BE2 /* xusb.c */; };
-		008FBFF01628BA3A00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
-		008FBFFF1628BB9600BC5BE2 /* dpfp.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFD71628BA0E00BC5BE2 /* dpfp.c */; };
-		008FC0001628BBCD00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
-		008FC00F1628BBE400BC5BE2 /* dpfp_threaded.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFDB1628BA0E00BC5BE2 /* dpfp_threaded.c */; };
-		008FC0101628BBE900BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
-		008FC01F1628BC1500BC5BE2 /* fxload.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFE11628BA0E00BC5BE2 /* fxload.c */; };
-		008FC0201628BC1B00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
-		008FC0211628BC5200BC5BE2 /* ezusb.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFDC1628BA0E00BC5BE2 /* ezusb.c */; };
-		008FC0301628BC7400BC5BE2 /* listdevs.c in Sources */ = {isa = PBXBuildFile; fileRef = 008FBFE71628BA0E00BC5BE2 /* listdevs.c */; };
-		008FC0311628BC7800BC5BE2 /* libusb-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */; };
-		1438D77A17A2ED9F00166101 /* hotplug.c in Sources */ = {isa = PBXBuildFile; fileRef = 1438D77817A2ED9F00166101 /* hotplug.c */; };
-		1438D77B17A2ED9F00166101 /* hotplug.h in Headers */ = {isa = PBXBuildFile; fileRef = 1438D77917A2ED9F00166101 /* hotplug.h */; };
-		1438D77D17A2EDCD00166101 /* poll_posix.c in Sources */ = {isa = PBXBuildFile; fileRef = 1438D77C17A2EDCD00166101 /* poll_posix.c */; };
-		1438D77F17A2F0EA00166101 /* strerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1438D77E17A2F0EA00166101 /* strerror.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		008FC0361628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
-			remoteInfo = libusbx;
-		};
-		008FC0381628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBFBC1628B9FE00BC5BE2;
-			remoteInfo = xusb;
-		};
-		008FC03A1628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBFF41628BB8B00BC5BE2;
-			remoteInfo = dpfp;
-		};
-		008FC03C1628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FC0041628BBDB00BC5BE2;
-			remoteInfo = dpfp_threaded;
-		};
-		008FC03E1628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FC0141628BC0300BC5BE2;
-			remoteInfo = fxload;
-		};
-		008FC0401628BC9A00BC5BE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FC0251628BC6B00BC5BE2;
-			remoteInfo = listdevs;
-		};
-		1443EE8B1641926D007E0579 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
-			remoteInfo = libusbx;
-		};
-		1443EE8D16419273007E0579 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
-			remoteInfo = libusbx;
-		};
-		1443EE8F16419276007E0579 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
-			remoteInfo = libusbx;
-		};
-		1443EE911641927A007E0579 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
-			remoteInfo = libusbx;
-		};
-		1443EE931641927D007E0579 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 008FBF281628B79300BC5BE2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 008FBF301628B79300BC5BE2;
-			remoteInfo = libusbx;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		008FBFBB1628B9FE00BC5BE2 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-		008FBFF31628BB8B00BC5BE2 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-		008FC0031628BBDB00BC5BE2 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-		008FC0131628BC0300BC5BE2 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-		008FC0241628BC6B00BC5BE2 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libusb-1.0.0.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
-		008FBF541628B7E800BC5BE2 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = "<group>"; };
-		008FBF551628B7E800BC5BE2 /* descriptor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = descriptor.c; sourceTree = "<group>"; };
-		008FBF561628B7E800BC5BE2 /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
-		008FBF5A1628B7E800BC5BE2 /* libusb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libusb.h; sourceTree = "<group>"; };
-		008FBF671628B7E800BC5BE2 /* libusbi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libusbi.h; sourceTree = "<group>"; };
-		008FBF6C1628B7E800BC5BE2 /* darwin_usb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = darwin_usb.c; sourceTree = "<group>"; };
-		008FBF6D1628B7E800BC5BE2 /* darwin_usb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = darwin_usb.h; sourceTree = "<group>"; };
-		008FBF711628B7E800BC5BE2 /* poll_posix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = poll_posix.h; sourceTree = "<group>"; };
-		008FBF741628B7E800BC5BE2 /* threads_posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = threads_posix.c; sourceTree = "<group>"; };
-		008FBF751628B7E800BC5BE2 /* threads_posix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threads_posix.h; sourceTree = "<group>"; };
-		008FBF7A1628B7E800BC5BE2 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sync.c; sourceTree = "<group>"; };
-		008FBF7B1628B7E800BC5BE2 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		008FBF7C1628B7E800BC5BE2 /* version_nano.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version_nano.h; sourceTree = "<group>"; };
-		008FBFA41628B84200BC5BE2 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		008FBFA61628B87000BC5BE2 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
-		008FBFA81628B88000BC5BE2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		008FBFAA1628B8CB00BC5BE2 /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = usr/lib/libobjc.dylib; sourceTree = SDKROOT; };
-		008FBFBD1628B9FE00BC5BE2 /* xusb */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xusb; sourceTree = BUILT_PRODUCTS_DIR; };
-		008FBFD71628BA0E00BC5BE2 /* dpfp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dpfp.c; sourceTree = "<group>"; };
-		008FBFDB1628BA0E00BC5BE2 /* dpfp_threaded.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dpfp_threaded.c; sourceTree = "<group>"; };
-		008FBFDC1628BA0E00BC5BE2 /* ezusb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ezusb.c; sourceTree = "<group>"; };
-		008FBFDD1628BA0E00BC5BE2 /* ezusb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ezusb.h; sourceTree = "<group>"; };
-		008FBFE11628BA0E00BC5BE2 /* fxload.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fxload.c; sourceTree = "<group>"; };
-		008FBFE71628BA0E00BC5BE2 /* listdevs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = listdevs.c; sourceTree = "<group>"; };
-		008FBFED1628BA0E00BC5BE2 /* xusb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xusb.c; sourceTree = "<group>"; };
-		008FBFF51628BB8B00BC5BE2 /* dpfp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dpfp; sourceTree = BUILT_PRODUCTS_DIR; };
-		008FC0051628BBDB00BC5BE2 /* dpfp_threaded */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dpfp_threaded; sourceTree = BUILT_PRODUCTS_DIR; };
-		008FC0151628BC0300BC5BE2 /* fxload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fxload; sourceTree = BUILT_PRODUCTS_DIR; };
-		008FC0261628BC6B00BC5BE2 /* listdevs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = listdevs; sourceTree = BUILT_PRODUCTS_DIR; };
-		1438D77817A2ED9F00166101 /* hotplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotplug.c; sourceTree = "<group>"; };
-		1438D77917A2ED9F00166101 /* hotplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotplug.h; sourceTree = "<group>"; };
-		1438D77C17A2EDCD00166101 /* poll_posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poll_posix.c; sourceTree = "<group>"; };
-		1438D77E17A2F0EA00166101 /* strerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strerror.c; sourceTree = "<group>"; };
-		1443EE8416417E63007E0579 /* common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = SOURCE_ROOT; };
-		1443EE8516417E63007E0579 /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = SOURCE_ROOT; };
-		1443EE8616417E63007E0579 /* libusbx_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libusbx_debug.xcconfig; sourceTree = SOURCE_ROOT; };
-		1443EE8716417E63007E0579 /* libusbx.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libusbx.xcconfig; sourceTree = SOURCE_ROOT; };
-		1443EE8816417E63007E0579 /* release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = SOURCE_ROOT; };
-		1443EE8916417EA6007E0579 /* libusbx_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libusbx_release.xcconfig; sourceTree = SOURCE_ROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		008FBF2E1628B79300BC5BE2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FBFAB1628B8CB00BC5BE2 /* libobjc.dylib in Frameworks */,
-				008FBFA91628B88000BC5BE2 /* IOKit.framework in Frameworks */,
-				008FBFA71628B87000BC5BE2 /* CoreFoundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FBFBA1628B9FE00BC5BE2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FBFF01628BA3A00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FBFF21628BB8B00BC5BE2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC0001628BBCD00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FC0021628BBDB00BC5BE2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC0101628BBE900BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FC0121628BC0300BC5BE2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC0201628BC1B00BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FC0231628BC6B00BC5BE2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC0311628BC7800BC5BE2 /* libusb-1.0.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		008FBF261628B79300BC5BE2 = {
-			isa = PBXGroup;
-			children = (
-				1443EE8316417DE3007E0579 /* xcconfig */,
-				008FBFA41628B84200BC5BE2 /* config.h */,
-				008FBF3B1628B7E800BC5BE2 /* libusb */,
-				008FBFC81628BA0E00BC5BE2 /* examples */,
-				1443EE8A16419057007E0579 /* Apple */,
-				008FBF321628B79300BC5BE2 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		008FBF321628B79300BC5BE2 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */,
-				008FBFBD1628B9FE00BC5BE2 /* xusb */,
-				008FBFF51628BB8B00BC5BE2 /* dpfp */,
-				008FC0051628BBDB00BC5BE2 /* dpfp_threaded */,
-				008FC0151628BC0300BC5BE2 /* fxload */,
-				008FC0261628BC6B00BC5BE2 /* listdevs */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		008FBF3B1628B7E800BC5BE2 /* libusb */ = {
-			isa = PBXGroup;
-			children = (
-				008FBF541628B7E800BC5BE2 /* core.c */,
-				008FBF551628B7E800BC5BE2 /* descriptor.c */,
-				1438D77817A2ED9F00166101 /* hotplug.c */,
-				1438D77917A2ED9F00166101 /* hotplug.h */,
-				008FBF561628B7E800BC5BE2 /* io.c */,
-				008FBF5A1628B7E800BC5BE2 /* libusb.h */,
-				008FBF671628B7E800BC5BE2 /* libusbi.h */,
-				008FBF6B1628B7E800BC5BE2 /* os */,
-				1438D77E17A2F0EA00166101 /* strerror.c */,
-				008FBF7A1628B7E800BC5BE2 /* sync.c */,
-				008FBF7B1628B7E800BC5BE2 /* version.h */,
-				008FBF7C1628B7E800BC5BE2 /* version_nano.h */,
-			);
-			name = libusb;
-			path = ../libusb;
-			sourceTree = "<group>";
-		};
-		008FBF6B1628B7E800BC5BE2 /* os */ = {
-			isa = PBXGroup;
-			children = (
-				008FBF6C1628B7E800BC5BE2 /* darwin_usb.c */,
-				008FBF6D1628B7E800BC5BE2 /* darwin_usb.h */,
-				1438D77C17A2EDCD00166101 /* poll_posix.c */,
-				008FBF711628B7E800BC5BE2 /* poll_posix.h */,
-				008FBF741628B7E800BC5BE2 /* threads_posix.c */,
-				008FBF751628B7E800BC5BE2 /* threads_posix.h */,
-			);
-			path = os;
-			sourceTree = "<group>";
-		};
-		008FBFC81628BA0E00BC5BE2 /* examples */ = {
-			isa = PBXGroup;
-			children = (
-				008FBFD71628BA0E00BC5BE2 /* dpfp.c */,
-				008FBFDB1628BA0E00BC5BE2 /* dpfp_threaded.c */,
-				008FBFDC1628BA0E00BC5BE2 /* ezusb.c */,
-				008FBFE11628BA0E00BC5BE2 /* fxload.c */,
-				008FBFE71628BA0E00BC5BE2 /* listdevs.c */,
-				008FBFED1628BA0E00BC5BE2 /* xusb.c */,
-				008FBFDD1628BA0E00BC5BE2 /* ezusb.h */,
-			);
-			name = examples;
-			path = ../examples;
-			sourceTree = "<group>";
-		};
-		1443EE8316417DE3007E0579 /* xcconfig */ = {
-			isa = PBXGroup;
-			children = (
-				1443EE8416417E63007E0579 /* common.xcconfig */,
-				1443EE8516417E63007E0579 /* debug.xcconfig */,
-				1443EE8816417E63007E0579 /* release.xcconfig */,
-				1443EE8716417E63007E0579 /* libusbx.xcconfig */,
-				1443EE8616417E63007E0579 /* libusbx_debug.xcconfig */,
-				1443EE8916417EA6007E0579 /* libusbx_release.xcconfig */,
-			);
-			name = xcconfig;
-			path = ../libusb;
-			sourceTree = "<group>";
-		};
-		1443EE8A16419057007E0579 /* Apple */ = {
-			isa = PBXGroup;
-			children = (
-				008FBFAA1628B8CB00BC5BE2 /* libobjc.dylib */,
-				008FBFA81628B88000BC5BE2 /* IOKit.framework */,
-				008FBFA61628B87000BC5BE2 /* CoreFoundation.framework */,
-			);
-			name = Apple;
-			path = ../libusb;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		008FBF2F1628B79300BC5BE2 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FBF891628B7E800BC5BE2 /* libusb.h in Headers */,
-				008FBF901628B7E800BC5BE2 /* libusbi.h in Headers */,
-				008FBF931628B7E800BC5BE2 /* darwin_usb.h in Headers */,
-				008FBF971628B7E800BC5BE2 /* poll_posix.h in Headers */,
-				008FBF9B1628B7E800BC5BE2 /* threads_posix.h in Headers */,
-				008FBFA11628B7E800BC5BE2 /* version.h in Headers */,
-				008FBFA21628B7E800BC5BE2 /* version_nano.h in Headers */,
-				008FBFA51628B84200BC5BE2 /* config.h in Headers */,
-				1438D77B17A2ED9F00166101 /* hotplug.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		008FBF301628B79300BC5BE2 /* libusbx */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 008FBF351628B79300BC5BE2 /* Build configuration list for PBXNativeTarget "libusbx" */;
-			buildPhases = (
-				008FBF2D1628B79300BC5BE2 /* Sources */,
-				008FBF2E1628B79300BC5BE2 /* Frameworks */,
-				008FBF2F1628B79300BC5BE2 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = libusbx;
-			productName = libusbx;
-			productReference = 008FBF311628B79300BC5BE2 /* libusb-1.0.0.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		008FBFBC1628B9FE00BC5BE2 /* xusb */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 008FBFC61628B9FE00BC5BE2 /* Build configuration list for PBXNativeTarget "xusb" */;
-			buildPhases = (
-				008FBFB91628B9FE00BC5BE2 /* Sources */,
-				008FBFBA1628B9FE00BC5BE2 /* Frameworks */,
-				008FBFBB1628B9FE00BC5BE2 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				1443EE941641927D007E0579 /* PBXTargetDependency */,
-			);
-			name = xusb;
-			productName = xusb;
-			productReference = 008FBFBD1628B9FE00BC5BE2 /* xusb */;
-			productType = "com.apple.product-type.tool";
-		};
-		008FBFF41628BB8B00BC5BE2 /* dpfp */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 008FBFFC1628BB8C00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp" */;
-			buildPhases = (
-				008FBFF11628BB8B00BC5BE2 /* Sources */,
-				008FBFF21628BB8B00BC5BE2 /* Frameworks */,
-				008FBFF31628BB8B00BC5BE2 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				1443EE921641927A007E0579 /* PBXTargetDependency */,
-			);
-			name = dpfp;
-			productName = dpfp;
-			productReference = 008FBFF51628BB8B00BC5BE2 /* dpfp */;
-			productType = "com.apple.product-type.tool";
-		};
-		008FC0041628BBDB00BC5BE2 /* dpfp_threaded */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 008FC00C1628BBDB00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp_threaded" */;
-			buildPhases = (
-				008FC0011628BBDB00BC5BE2 /* Sources */,
-				008FC0021628BBDB00BC5BE2 /* Frameworks */,
-				008FC0031628BBDB00BC5BE2 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				1443EE9016419276007E0579 /* PBXTargetDependency */,
-			);
-			name = dpfp_threaded;
-			productName = dpfp_threaded;
-			productReference = 008FC0051628BBDB00BC5BE2 /* dpfp_threaded */;
-			productType = "com.apple.product-type.tool";
-		};
-		008FC0141628BC0300BC5BE2 /* fxload */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 008FC01C1628BC0300BC5BE2 /* Build configuration list for PBXNativeTarget "fxload" */;
-			buildPhases = (
-				008FC0111628BC0300BC5BE2 /* Sources */,
-				008FC0121628BC0300BC5BE2 /* Frameworks */,
-				008FC0131628BC0300BC5BE2 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				1443EE8E16419273007E0579 /* PBXTargetDependency */,
-			);
-			name = fxload;
-			productName = fxload;
-			productReference = 008FC0151628BC0300BC5BE2 /* fxload */;
-			productType = "com.apple.product-type.tool";
-		};
-		008FC0251628BC6B00BC5BE2 /* listdevs */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 008FC02D1628BC6B00BC5BE2 /* Build configuration list for PBXNativeTarget "listdevs" */;
-			buildPhases = (
-				008FC0221628BC6B00BC5BE2 /* Sources */,
-				008FC0231628BC6B00BC5BE2 /* Frameworks */,
-				008FC0241628BC6B00BC5BE2 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				1443EE8C1641926D007E0579 /* PBXTargetDependency */,
-			);
-			name = listdevs;
-			productName = listdevs;
-			productReference = 008FC0261628BC6B00BC5BE2 /* listdevs */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		008FBF281628B79300BC5BE2 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0450;
-				ORGANIZATIONNAME = libusbx;
-			};
-			buildConfigurationList = 008FBF2B1628B79300BC5BE2 /* Build configuration list for PBXProject "libusbx" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 008FBF261628B79300BC5BE2;
-			productRefGroup = 008FBF321628B79300BC5BE2 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				008FBF301628B79300BC5BE2 /* libusbx */,
-				008FBFBC1628B9FE00BC5BE2 /* xusb */,
-				008FBFF41628BB8B00BC5BE2 /* dpfp */,
-				008FC0041628BBDB00BC5BE2 /* dpfp_threaded */,
-				008FC0141628BC0300BC5BE2 /* fxload */,
-				008FC0251628BC6B00BC5BE2 /* listdevs */,
-				008FC0321628BC9400BC5BE2 /* all */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		008FBF2D1628B79300BC5BE2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FBF861628B7E800BC5BE2 /* core.c in Sources */,
-				008FBF871628B7E800BC5BE2 /* descriptor.c in Sources */,
-				008FBF881628B7E800BC5BE2 /* io.c in Sources */,
-				008FBF921628B7E800BC5BE2 /* darwin_usb.c in Sources */,
-				008FBF9A1628B7E800BC5BE2 /* threads_posix.c in Sources */,
-				008FBFA01628B7E800BC5BE2 /* sync.c in Sources */,
-				1438D77A17A2ED9F00166101 /* hotplug.c in Sources */,
-				1438D77D17A2EDCD00166101 /* poll_posix.c in Sources */,
-				1438D77F17A2F0EA00166101 /* strerror.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FBFB91628B9FE00BC5BE2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FBFEF1628BA3500BC5BE2 /* xusb.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FBFF11628BB8B00BC5BE2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FBFFF1628BB9600BC5BE2 /* dpfp.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FC0011628BBDB00BC5BE2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC00F1628BBE400BC5BE2 /* dpfp_threaded.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FC0111628BC0300BC5BE2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC0211628BC5200BC5BE2 /* ezusb.c in Sources */,
-				008FC01F1628BC1500BC5BE2 /* fxload.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		008FC0221628BC6B00BC5BE2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				008FC0301628BC7400BC5BE2 /* listdevs.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		008FC0371628BC9A00BC5BE2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBF301628B79300BC5BE2 /* libusbx */;
-			targetProxy = 008FC0361628BC9A00BC5BE2 /* PBXContainerItemProxy */;
-		};
-		008FC0391628BC9A00BC5BE2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBFBC1628B9FE00BC5BE2 /* xusb */;
-			targetProxy = 008FC0381628BC9A00BC5BE2 /* PBXContainerItemProxy */;
-		};
-		008FC03B1628BC9A00BC5BE2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBFF41628BB8B00BC5BE2 /* dpfp */;
-			targetProxy = 008FC03A1628BC9A00BC5BE2 /* PBXContainerItemProxy */;
-		};
-		008FC03D1628BC9A00BC5BE2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FC0041628BBDB00BC5BE2 /* dpfp_threaded */;
-			targetProxy = 008FC03C1628BC9A00BC5BE2 /* PBXContainerItemProxy */;
-		};
-		008FC03F1628BC9A00BC5BE2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FC0141628BC0300BC5BE2 /* fxload */;
-			targetProxy = 008FC03E1628BC9A00BC5BE2 /* PBXContainerItemProxy */;
-		};
-		008FC0411628BC9A00BC5BE2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FC0251628BC6B00BC5BE2 /* listdevs */;
-			targetProxy = 008FC0401628BC9A00BC5BE2 /* PBXContainerItemProxy */;
-		};
-		1443EE8C1641926D007E0579 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBF301628B79300BC5BE2 /* libusbx */;
-			targetProxy = 1443EE8B1641926D007E0579 /* PBXContainerItemProxy */;
-		};
-		1443EE8E16419273007E0579 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBF301628B79300BC5BE2 /* libusbx */;
-			targetProxy = 1443EE8D16419273007E0579 /* PBXContainerItemProxy */;
-		};
-		1443EE9016419276007E0579 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBF301628B79300BC5BE2 /* libusbx */;
-			targetProxy = 1443EE8F16419276007E0579 /* PBXContainerItemProxy */;
-		};
-		1443EE921641927A007E0579 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBF301628B79300BC5BE2 /* libusbx */;
-			targetProxy = 1443EE911641927A007E0579 /* PBXContainerItemProxy */;
-		};
-		1443EE941641927D007E0579 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 008FBF301628B79300BC5BE2 /* libusbx */;
-			targetProxy = 1443EE931641927D007E0579 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		008FBF331628B79300BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		008FBF341628B79300BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		008FBF361628B79300BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8616417E63007E0579 /* libusbx_debug.xcconfig */;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		008FBF371628B79300BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8916417EA6007E0579 /* libusbx_release.xcconfig */;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		008FBFC41628B9FE00BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		008FBFC51628B9FE00BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		008FBFFD1628BB8C00BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		008FBFFE1628BB8C00BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		008FC00D1628BBDB00BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		008FC00E1628BBDB00BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		008FC01D1628BC0300BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		008FC01E1628BC0300BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		008FC02E1628BC6B00BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8516417E63007E0579 /* debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		008FC02F1628BC6B00BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1443EE8816417E63007E0579 /* release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		008FC0341628BC9400BC5BE2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		008FC0351628BC9400BC5BE2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		008FBF2B1628B79300BC5BE2 /* Build configuration list for PBXProject "libusbx" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FBF331628B79300BC5BE2 /* Debug */,
-				008FBF341628B79300BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FBF351628B79300BC5BE2 /* Build configuration list for PBXNativeTarget "libusbx" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FBF361628B79300BC5BE2 /* Debug */,
-				008FBF371628B79300BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FBFC61628B9FE00BC5BE2 /* Build configuration list for PBXNativeTarget "xusb" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FBFC41628B9FE00BC5BE2 /* Debug */,
-				008FBFC51628B9FE00BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FBFFC1628BB8C00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FBFFD1628BB8C00BC5BE2 /* Debug */,
-				008FBFFE1628BB8C00BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FC00C1628BBDB00BC5BE2 /* Build configuration list for PBXNativeTarget "dpfp_threaded" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FC00D1628BBDB00BC5BE2 /* Debug */,
-				008FC00E1628BBDB00BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FC01C1628BC0300BC5BE2 /* Build configuration list for PBXNativeTarget "fxload" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FC01D1628BC0300BC5BE2 /* Debug */,
-				008FC01E1628BC0300BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FC02D1628BC6B00BC5BE2 /* Build configuration list for PBXNativeTarget "listdevs" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FC02E1628BC6B00BC5BE2 /* Debug */,
-				008FC02F1628BC6B00BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		008FC0331628BC9400BC5BE2 /* Build configuration list for PBXAggregateTarget "all" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				008FC0341628BC9400BC5BE2 /* Debug */,
-				008FC0351628BC9400BC5BE2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 008FBF281628B79300BC5BE2 /* Project object */;
-}
diff --git a/Xcode/release.xcconfig b/Xcode/release.xcconfig
index 2bbc1a8..48aff69 100644
--- a/Xcode/release.xcconfig
+++ b/Xcode/release.xcconfig
@@ -1,7 +1,7 @@
 //
-// libusbx Xcode configuration file
+// libusb Xcode configuration file
 // Copyright © 2012 Pete Batard <pete@akeo.ie>
-// For more information, please visit: <http://libusbx.org>
+// For more information, please visit: <http://libusb.info>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/android/config.h b/android/config.h
index 0d0fdb7..d36325e 100644
--- a/android/config.h
+++ b/android/config.h
@@ -1,5 +1,5 @@
 /*
- * Android build config for libusbx
+ * Android build config for libusb
  * Copyright © 2012-2013 RealVNC Ltd. <toby.gray@realvnc.com>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/configure.ac b/configure.ac
index 3495acf..fffa2e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ LU_DEFINE_VERSION_ATOM([LIBUSB_MINOR])
 LU_DEFINE_VERSION_ATOM([LIBUSB_MICRO])
 LU_DEFINE_VERSION_RC_ATOM([LIBUSB_RC])
 
-AC_INIT([libusbx],[LIBUSB_MAJOR[.]LIBUSB_MINOR[.]LIBUSB_MICRO[]LIBUSB_RC],[libusbx-devel@lists.sourceforge.net],[libusbx],[http://libusbx.org])
+AC_INIT([libusb],[LIBUSB_MAJOR[.]LIBUSB_MINOR[.]LIBUSB_MICRO[]LIBUSB_RC],[libusb-devel@lists.sourceforge.net],[libusb],[http://libusb.info])
 
 # Library versioning
 # These numbers should be tweaked on every release. Read carefully:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 544a281..76211f2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,5 +5,5 @@ docs: doxygen.cfg
 
 docs-upload: docs
 	ln -s html api-1.0
-	scp -r api-1.0 pbatard@web.sourceforge.net:/home/project-web/libusbx/htdocs
+	scp -r api-1.0 pbatard@web.sourceforge.net:/home/project-web/libusb/htdocs
 	rm -f api-1.0
diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index 05f984a..4ec681a 100644
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -44,7 +44,7 @@ PROJECT_BRIEF          = "eXpand your USB potential"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will
 # copy the logo to the output directory.
 
-PROJECT_LOGO           = libusbx.png
+PROJECT_LOGO           = libusb.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/doc/libusbx.png b/doc/libusb.png
index de69d1e..de69d1e 100644
--- a/doc/libusbx.png
+++ b/doc/libusb.png
diff --git a/examples/dpfp.c b/examples/dpfp.c
index 3f41e0e..ed68267 100644
--- a/examples/dpfp.c
+++ b/examples/dpfp.c
@@ -1,5 +1,5 @@
 /*
- * libusbx example program to manipulate U.are.U 4000B fingerprint scanner.
+ * libusb example program to manipulate U.are.U 4000B fingerprint scanner.
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  *
  * Basic image capture program only, does not consider the powerup quirks or
diff --git a/examples/dpfp_threaded.c b/examples/dpfp_threaded.c
index 6970dac..771e2ec 100644
--- a/examples/dpfp_threaded.c
+++ b/examples/dpfp_threaded.c
@@ -1,5 +1,5 @@
 /*
- * libusbx example program to manipulate U.are.U 4000B fingerprint scanner.
+ * libusb example program to manipulate U.are.U 4000B fingerprint scanner.
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  *
  * Basic image capture program only, does not consider the powerup quirks or
diff --git a/examples/ezusb.c b/examples/ezusb.c
index 278af5d..5111f98 100644
--- a/examples/ezusb.c
+++ b/examples/ezusb.c
@@ -181,7 +181,7 @@ static bool ezusb_cpucs(libusb_device_handle *device, uint32_t addr, bool doRun)
 		RW_INTERNAL, addr & 0xFFFF, addr >> 16,
 		&data, 1, 1000);
 	if ((status != 1) &&
-		/* We may get an I/O error from libusbx as the device disappears */
+		/* We may get an I/O error from libusb as the device disappears */
 		((!doRun) || (status != LIBUSB_ERROR_IO)))
 	{
 		const char *mesg = "can't modify CPUCS";
@@ -208,7 +208,7 @@ static bool ezusb_fx3_jump(libusb_device_handle *device, uint32_t addr)
 		LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,
 		RW_INTERNAL, addr & 0xFFFF, addr >> 16,
 		NULL, 0, 1000);
-	/* We may get an I/O error from libusbx as the device disappears */
+	/* We may get an I/O error from libusb as the device disappears */
 	if ((status != 0) && (status != LIBUSB_ERROR_IO))
 	{
 		const char *mesg = "failed to send jump command";
@@ -457,7 +457,7 @@ static int parse_iic(FILE *image, void *context,
 		data_addr = (block_header[2] << 8) + block_header[3];
 		if (data_len > sizeof(data)) {
 			/* If this is ever reported as an error, switch to using malloc/realloc */
-			logerror("IIC data block too small - please report this error to libusbx.org\n");
+			logerror("IIC data block too small - please report this error to libusb.info\n");
 			return -1;
 		}
 		read_len = fread(data, 1, data_len, image);
@@ -699,7 +699,7 @@ exit:
 }
 
 /*
- * Load a firmware file into target RAM. device is the open libusbx
+ * Load a firmware file into target RAM. device is the open libusb
  * device, and the path is the name of the source file. Open the file,
  * parse the bytes, and write them in one or two phases.
  *
diff --git a/examples/fxload.c b/examples/fxload.c
index 14226ca..9f0d554 100644
--- a/examples/fxload.c
+++ b/examples/fxload.c
@@ -40,7 +40,7 @@ static bool dosyslog = false;
 #endif
 
 #ifndef FXLOAD_VERSION
-#define FXLOAD_VERSION (__DATE__ " (libusbx)")
+#define FXLOAD_VERSION (__DATE__ " (libusb)")
 #endif
 
 #ifndef ARRAYSIZE
@@ -69,7 +69,7 @@ static int print_usage(int error_code) {
 	fprintf(stderr, "  -i <path>       -- Firmware to upload\n");
 	fprintf(stderr, "  -t <type>       -- Target type: an21, fx, fx2, fx2lp, fx3\n");
 	fprintf(stderr, "  -d <vid:pid>    -- Target device, as an USB VID:PID\n");
-	fprintf(stderr, "  -p <bus,addr>   -- Target device, as a libusbx bus number and device address path\n");
+	fprintf(stderr, "  -p <bus,addr>   -- Target device, as a libusb bus number and device address path\n");
 	fprintf(stderr, "  -v              -- Increase verbosity\n");
 	fprintf(stderr, "  -q              -- Decrease verbosity (silent mode)\n");
 	fprintf(stderr, "  -V              -- Print program version\n");
@@ -165,7 +165,7 @@ int main(int argc, char*argv[])
 		}
 	}
 
-	/* open the device using libusbx */
+	/* open the device using libusb */
 	status = libusb_init(NULL);
 	if (status < 0) {
 		logerror("libusb_init() failed: %s\n", libusb_error_name(status));
diff --git a/examples/listdevs.c b/examples/listdevs.c
index 31ad26e..3328910 100644
--- a/examples/listdevs.c
+++ b/examples/listdevs.c
@@ -1,5 +1,5 @@
 /*
- * libusbx example program to list devices on the bus
+ * libusb example program to list devices on the bus
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/examples/xusb.c b/examples/xusb.c
index 56386df..77c8c46 100644
--- a/examples/xusb.c
+++ b/examples/xusb.c
@@ -43,7 +43,7 @@
 #define false (!true)
 #endif
 
-// Future versions of libusbx will use usb_interface instead of interface
+// Future versions of libusb will use usb_interface instead of interface
 // in libusb_config_descriptor => catter for that
 #define usb_interface interface
 
@@ -1089,7 +1089,7 @@ int main(int argc, char** argv)
 	}
 
 	version = libusb_get_version();
-	printf("Using libusbx v%d.%d.%d.%d\n\n", version->major, version->minor, version->micro, version->nano);
+	printf("Using libusb v%d.%d.%d.%d\n\n", version->major, version->minor, version->micro, version->nano);
 	r = libusb_init(NULL);
 	if (r < 0)
 		return r;
diff --git a/libusb-1.0.pc.in b/libusb-1.0.pc.in
index 7bc33c1..aa023b3 100644
--- a/libusb-1.0.pc.in
+++ b/libusb-1.0.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libusbx-1.0
+Name: libusb-1.0
 Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace
 Version: @VERSION@
 Libs: -L${libdir} -lusb-1.0
diff --git a/libusb/core.c b/libusb/core.c
index f48517b..4961cf6 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
 /*
- * Core functions for libusbx
+ * Core functions for libusb
  * Copyright © 2012-2013 Nathan Hjelm <hjelmn@cs.unm.edu>
  * Copyright © 2007-2008 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
@@ -63,7 +63,7 @@ const struct usbi_os_backend * const usbi_backend = &wince_backend;
 struct libusb_context *usbi_default_context = NULL;
 static const struct libusb_version libusb_version_internal =
 	{ LIBUSB_MAJOR, LIBUSB_MINOR, LIBUSB_MICRO, LIBUSB_NANO,
-	  LIBUSB_RC, "http://libusbx.org" };
+	  LIBUSB_RC, "http://libusb.info" };
 static int default_context_refcnt = 0;
 static usbi_mutex_static_t default_context_lock = USBI_MUTEX_INITIALIZER;
 static struct timeval timestamp_origin = { 0, 0 };
@@ -72,18 +72,18 @@ usbi_mutex_static_t active_contexts_lock = USBI_MUTEX_INITIALIZER;
 struct list_head active_contexts_list;
 
 /**
- * \mainpage libusbx-1.0 API Reference
+ * \mainpage libusb-1.0 API Reference
  *
  * \section intro Introduction
  *
- * libusbx is an open source library that allows you to communicate with USB
+ * libusb is an open source library that allows you to communicate with USB
  * devices from userspace. For more info, see the
- * <a href="http://libusbx.org">libusbx homepage</a>.
+ * <a href="http://libusb.info">libusb homepage</a>.
  *
  * This documentation is aimed at application developers wishing to
  * communicate with USB peripherals from their own software. After reviewing
  * this documentation, feedback and questions can be sent to the
- * <a href="http://mailing-list.libusbx.org">libusbx-devel mailing list</a>.
+ * <a href="http://mailing-list.libusb.info">libusb-devel mailing list</a>.
  *
  * This documentation assumes knowledge of how to operate USB devices from
  * a software standpoint (descriptors, configurations, interfaces, endpoints,
@@ -107,25 +107,25 @@ struct list_head active_contexts_list;
  * \section gettingstarted Getting Started
  *
  * To begin reading the API documentation, start with the Modules page which
- * links to the different categories of libusbx's functionality.
+ * links to the different categories of libusb's functionality.
  *
  * One decision you will have to make is whether to use the synchronous
  * or the asynchronous data transfer interface. The \ref io documentation
  * provides some insight into this topic.
  *
- * Some example programs can be found in the libusbx source distribution under
- * the "examples" subdirectory. The libusbx homepage includes a list of
- * real-life project examples which use libusbx.
+ * Some example programs can be found in the libusb source distribution under
+ * the "examples" subdirectory. The libusb homepage includes a list of
+ * real-life project examples which use libusb.
  *
  * \section errorhandling Error handling
  *
- * libusbx functions typically return 0 on success or a negative error code
+ * libusb functions typically return 0 on success or a negative error code
  * on failure. These negative error codes relate to LIBUSB_ERROR constants
  * which are listed on the \ref misc "miscellaneous" documentation page.
  *
  * \section msglog Debug message logging
  *
- * libusbx uses stderr for all logging. By default, logging is set to NONE,
+ * libusb uses stderr for all logging. By default, logging is set to NONE,
  * which means that no output will be produced. However, unless the library
  * has been compiled with logging disabled, then any application calls to
  * libusb_set_debug(), or the setting of the environmental variable
@@ -134,19 +134,19 @@ struct list_head active_contexts_list;
  * direct it to the null device if its output is undesireable.
  *
  * The libusb_set_debug() function can be used to enable logging of certain
- * messages. Under standard configuration, libusbx doesn't really log much
+ * messages. Under standard configuration, libusb doesn't really log much
  * so you are advised to use this function to enable all error/warning/
  * informational messages. It will help debug problems with your software.
  *
  * The logged messages are unstructured. There is no one-to-one correspondence
  * between messages being logged and success or failure return codes from
- * libusbx functions. There is no format to the messages, so you should not
+ * libusb functions. There is no format to the messages, so you should not
  * try to capture or parse them. They are not and will not be localized.
  * These messages are not intended to being passed to your application user;
- * instead, you should interpret the error codes returned from libusbx functions
+ * instead, you should interpret the error codes returned from libusb functions
  * and provide appropriate notification to the user. The messages are simply
  * there to aid you as a programmer, and if you're confused because you're
- * getting a strange error code from a libusbx function, enabling message
+ * getting a strange error code from a libusb function, enabling message
  * logging may give you a suitable explanation.
  *
  * The LIBUSB_DEBUG environment variable can be used to enable message logging
@@ -155,18 +155,18 @@ struct list_head active_contexts_list;
  * environment variable is set, the message logging verbosity level is fixed
  * and libusb_set_debug() effectively does nothing.
  *
- * libusbx can be compiled without any logging functions, useful for embedded
+ * libusb can be compiled without any logging functions, useful for embedded
  * systems. In this case, libusb_set_debug() and the LIBUSB_DEBUG environment
  * variable have no effects.
  *
- * libusbx can also be compiled with verbose debugging messages always. When
+ * libusb can also be compiled with verbose debugging messages always. When
  * the library is compiled in this way, all messages of all verbosities are
  * always logged. libusb_set_debug() and the LIBUSB_DEBUG environment variable
  * have no effects.
  *
  * \section remarks Other remarks
  *
- * libusbx does have imperfections. The \ref caveats "caveats" page attempts
+ * libusb does have imperfections. The \ref caveats "caveats" page attempts
  * to document these.
  */
 
@@ -181,7 +181,7 @@ struct list_head active_contexts_list;
  * reset).
  *
  * The problem is that any other program could reset the device your program
- * is working with, at any time. libusbx does not offer a mechanism to inform
+ * is working with, at any time. libusb does not offer a mechanism to inform
  * you when this has happened, so if someone else resets your device it will
  * not be clear to your own program why the device state has changed.
  *
@@ -206,7 +206,7 @@ struct list_head active_contexts_list;
  *
  * \section configsel Configuration selection and handling
  *
- * When libusbx presents a device handle to an application, there is a chance
+ * When libusb presents a device handle to an application, there is a chance
  * that the corresponding device may be in unconfigured state. For devices
  * with multiple configurations, there is also a chance that the configuration
  * currently selected is not the one that the application wants to use.
@@ -217,13 +217,13 @@ struct list_head active_contexts_list;
  * -# If the device is already in the desired configuration, calling
  *    libusb_set_configuration() using the same configuration value will cause
  *    a lightweight device reset. This may not be desirable behaviour.
- * -# libusbx will be unable to change configuration if the device is in
+ * -# libusb will be unable to change configuration if the device is in
  *    another configuration and other programs or drivers have claimed
  *    interfaces under that configuration.
- * -# In the case where the desired configuration is already active, libusbx
+ * -# In the case where the desired configuration is already active, libusb
  *    may not even be able to perform a lightweight device reset. For example,
  *    take my USB keyboard with fingerprint reader: I'm interested in driving
- *    the fingerprint reader interface through libusbx, but the kernel's
+ *    the fingerprint reader interface through libusb, but the kernel's
  *    USB-HID driver will almost always have claimed the keyboard interface.
  *    Because the kernel has claimed an interface, it is not even possible to
  *    perform the lightweight device reset, so libusb_set_configuration() will
@@ -263,13 +263,13 @@ if (cfg != desired)
  * considerations apply to Darwin or other platforms.
  *
  * When a transfer completes early (i.e. when less data is received/sent in
- * any one packet than the transfer buffer allows for) then libusbx is designed
+ * any one packet than the transfer buffer allows for) then libusb is designed
  * to terminate the transfer immediately, not transferring or receiving any
  * more data unless other transfers have been queued by the user.
  *
- * On legacy platforms, libusbx is unable to do this in all situations. After
+ * On legacy platforms, libusb is unable to do this in all situations. After
  * the incomplete packet occurs, "surplus" data may be transferred. For recent
- * versions of libusbx, this information is kept (the data length of the
+ * versions of libusb, this information is kept (the data length of the
  * transfer is updated) and, for device-to-host transfers, any surplus data was
  * added to the buffer. Still, this is not a nice solution because it loses the
  * information about the end of the short packet, and the user probably wanted
@@ -278,7 +278,7 @@ if (cfg != desired)
  *
  * \section zlp Zero length packets
  *
- * - libusbx is able to send a packet of zero length to an endpoint simply by
+ * - libusb is able to send a packet of zero length to an endpoint simply by
  * submitting a transfer of zero length.
  * - The \ref libusb_transfer_flags::LIBUSB_TRANSFER_ADD_ZERO_PACKET
  * "LIBUSB_TRANSFER_ADD_ZERO_PACKET" flag is currently only supported on Linux.
@@ -287,24 +287,24 @@ if (cfg != desired)
 /**
  * \page contexts Contexts
  *
- * It is possible that libusbx may be used simultaneously from two independent
+ * It is possible that libusb may be used simultaneously from two independent
  * libraries linked into the same executable. For example, if your application
  * has a plugin-like system which allows the user to dynamically load a range
  * of modules into your program, it is feasible that two independently
- * developed modules may both use libusbx.
+ * developed modules may both use libusb.
  *
- * libusbx is written to allow for these multiple user scenarios. The two
- * "instances" of libusbx will not interfere: libusb_set_debug() calls
+ * libusb is written to allow for these multiple user scenarios. The two
+ * "instances" of libusb will not interfere: libusb_set_debug() calls
  * from one user will not affect the same settings for other users, other
- * users can continue using libusbx after one of them calls libusb_exit(), etc.
+ * users can continue using libusb after one of them calls libusb_exit(), etc.
  *
- * This is made possible through libusbx's <em>context</em> concept. When you
+ * This is made possible through libusb's <em>context</em> concept. When you
  * call libusb_init(), you are (optionally) given a context. You can then pass
- * this context pointer back into future libusbx functions.
+ * this context pointer back into future libusb functions.
  *
  * In order to keep things simple for more simplistic applications, it is
  * legal to pass NULL to all functions requiring a context pointer (as long as
- * you're sure no other code will attempt to use libusbx from the same process).
+ * you're sure no other code will attempt to use libusb from the same process).
  * When you pass NULL, the default context will be used. The default context
  * is created the first time a process calls libusb_init() when no other
  * context is alive. Contexts are destroyed during libusb_exit().
@@ -317,17 +317,17 @@ if (cfg != desired)
  * reference count goes from 0 to 1, and is deinitialized and destroyed when
  * its reference count goes from 1 to 0.
  *
- * You may be wondering why only a subset of libusbx functions require a
- * context pointer in their function definition. Internally, libusbx stores
+ * You may be wondering why only a subset of libusb functions require a
+ * context pointer in their function definition. Internally, libusb stores
  * context pointers in other objects (e.g. libusb_device instances) and hence
  * can infer the context from those objects.
  */
 
 /**
  * @defgroup lib Library initialization/deinitialization
- * This page details how to initialize and deinitialize libusbx. Initialization
- * must be performed before using any libusbx functionality, and similarly you
- * must not call any libusbx functions after deinitialization.
+ * This page details how to initialize and deinitialize libusb. Initialization
+ * must be performed before using any libusb functionality, and similarly you
+ * must not call any libusb functions after deinitialization.
  */
 
 /**
@@ -384,7 +384,7 @@ libusb_free_device_list(list, 1);
  * device.
  *
  * \section devshandles Devices and device handles
- * libusbx has a concept of a USB device, represented by the
+ * libusb has a concept of a USB device, represented by the
  * \ref libusb_device opaque type. A device represents a USB device that
  * is currently or was previously connected to the system. Using a reference
  * to a device, you can determine certain information about the device (e.g.
@@ -400,8 +400,8 @@ libusb_free_device_list(list, 1);
  * using the device.
  *
  * When you've found a device that you'd like to operate, you must ask
- * libusbx to open the device using the libusb_open() function. Assuming
- * success, libusbx then returns you a <em>device handle</em>
+ * libusb to open the device using the libusb_open() function. Assuming
+ * success, libusb then returns you a <em>device handle</em>
  * (a \ref libusb_device_handle pointer). All "real" I/O operations then
  * operate on the handle rather than the original device pointer.
  *
@@ -409,10 +409,10 @@ libusb_free_device_list(list, 1);
  *
  * Device discovery (i.e. calling libusb_get_device_list()) returns a
  * freshly-allocated list of devices. The list itself must be freed when
- * you are done with it. libusbx also needs to know when it is OK to free
+ * you are done with it. libusb also needs to know when it is OK to free
  * the contents of the list - the devices themselves.
  *
- * To handle these issues, libusbx provides you with two separate items:
+ * To handle these issues, libusb provides you with two separate items:
  * - A function to free the list itself
  * - A reference counting system for the devices inside
  *
@@ -608,7 +608,7 @@ int usbi_sanitize_device(struct libusb_device *dev)
 	return 0;
 }
 
-/* Examine libusbx's internal list of known devices, looking for one with
+/* Examine libusb's internal list of known devices, looking for one with
  * a specific session ID. Returns the matching device if it was found, and
  * NULL otherwise. */
 struct libusb_device *usbi_get_device_by_session_id(struct libusb_context *ctx,
@@ -763,7 +763,7 @@ uint8_t API_EXPORTED libusb_get_port_number(libusb_device *dev)
 /** \ingroup dev
  * Get the list of all port numbers from root for the specified device
  *
- * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102
+ * Since version 1.0.16, \ref libusb_API_VERSION >= 0x01000102
  * \param dev a device
  * \param port_numbers the array that should contain the port numbers
  * \param port_numbers_len the maximum length of the array. As per the USB 3.0
@@ -811,7 +811,7 @@ int API_EXPORTED libusb_get_port_path(libusb_context *ctx, libusb_device *dev,
  * \returns the device parent or NULL if not available
  * You should issue a \ref libusb_get_device_list() before calling this
  * function and make sure that you only access the parent before issuing
- * \ref libusb_free_device_list(). The reason is that libusbx currently does
+ * \ref libusb_free_device_list(). The reason is that libusb currently does
  * not maintain a permanent list of device instances, and therefore can
  * only guarantee that parents are fully instantiated within a 
  * libusb_get_device_list() - libusb_free_device_list() block.
@@ -1120,7 +1120,7 @@ int API_EXPORTED libusb_open(libusb_device *dev,
 	/* At this point, we want to interrupt any existing event handlers so
 	 * that they realise the addition of the new device's poll fd. One
 	 * example when this is desirable is if the user is running a separate
-	 * dedicated libusbx events handling thread, which is running with a long
+	 * dedicated libusb events handling thread, which is running with a long
 	 * or infinite timeout. We want to interrupt that iteration of the loop,
 	 * so that it picks up the new fd, and then continues. */
 	usbi_fd_notification(ctx);
@@ -1131,7 +1131,7 @@ int API_EXPORTED libusb_open(libusb_device *dev,
 /** \ingroup dev
  * Convenience function for finding a device with a particular
  * <tt>idVendor</tt>/<tt>idProduct</tt> combination. This function is intended
- * for those scenarios where you are using libusbx to knock up a quick test
+ * for those scenarios where you are using libusb to knock up a quick test
  * application - it allows you to avoid calling libusb_get_device_list() and
  * worrying about traversing/freeing the list.
  *
@@ -1425,7 +1425,7 @@ int API_EXPORTED libusb_set_configuration(libusb_device_handle *dev,
  * you wish to use before you can perform I/O on any of its endpoints.
  *
  * It is legal to attempt to claim an already-claimed interface, in which
- * case libusbx just returns 0 without doing anything.
+ * case libusb just returns 0 without doing anything.
  *
  * If auto_detach_kernel_driver is set to 1 for <tt>dev</tt>, the kernel driver
  * will be detached if necessary, on failure the detach error is returned.
@@ -1617,7 +1617,7 @@ int API_EXPORTED libusb_reset_device(libusb_device_handle *dev)
 
 /** \ingroup dev
  * Determine if a kernel driver is active on an interface. If a kernel driver
- * is active, you cannot claim the interface, and libusbx will be unable to
+ * is active, you cannot claim the interface, and libusb will be unable to
  * perform I/O.
  *
  * This functionality is not available on Windows.
@@ -1652,7 +1652,7 @@ int API_EXPORTED libusb_kernel_driver_active(libusb_device_handle *dev,
  *
  * This functionality is not available on Darwin or Windows.
  *
- * Note that libusbx itself also talks to the device through a special kernel
+ * Note that libusb itself also talks to the device through a special kernel
  * driver, if this driver is already attached to the device, this call will
  * not detach it and return LIBUSB_ERROR_NOT_FOUND.
  *
@@ -1716,15 +1716,15 @@ int API_EXPORTED libusb_attach_kernel_driver(libusb_device_handle *dev,
 }
 
 /** \ingroup dev
- * Enable/disable libusbx's automatic kernel driver detachment. When this is
- * enabled libusbx will automatically detach the kernel driver on an interface
+ * Enable/disable libusb's automatic kernel driver detachment. When this is
+ * enabled libusb will automatically detach the kernel driver on an interface
  * when claiming the interface, and attach it when releasing the interface.
  *
  * Automatic kernel driver detachment is disabled on newly opened device
  * handles by default.
  *
  * On platforms which do not have LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
- * this function will return LIBUSB_ERROR_NOT_SUPPORTED, and libusbx will
+ * this function will return LIBUSB_ERROR_NOT_SUPPORTED, and libusb will
  * continue as if this function was never called.
  *
  * \param dev a device handle
@@ -1754,19 +1754,19 @@ int API_EXPORTED libusb_set_auto_detach_kernel_driver(
  * printed. If you choose to increase the message verbosity level, ensure
  * that your application does not close the stdout/stderr file descriptors.
  *
- * You are advised to use level LIBUSB_LOG_LEVEL_WARNING. libusbx is conservative
+ * You are advised to use level LIBUSB_LOG_LEVEL_WARNING. libusb is conservative
  * with its message logging and most of the time, will only log messages that
  * explain error conditions and other oddities. This will help you debug
  * your software.
  *
- * If the LIBUSB_DEBUG environment variable was set when libusbx was
+ * If the LIBUSB_DEBUG environment variable was set when libusb was
  * initialized, this function does nothing: the message verbosity is fixed
  * to the value in the environment variable.
  *
- * If libusbx was compiled without any message logging, this function does
+ * If libusb was compiled without any message logging, this function does
  * nothing: you'll never get any messages.
  *
- * If libusbx was compiled with verbose debug message logging, this function
+ * If libusb was compiled with verbose debug message logging, this function
  * does nothing: you'll always get messages from all levels.
  *
  * \param ctx the context to operate on, or NULL for the default context
@@ -1781,7 +1781,7 @@ void API_EXPORTED libusb_set_debug(libusb_context *ctx, int level)
 
 /** \ingroup lib
  * Initialize libusb. This function must be called before calling any other
- * libusbx function.
+ * libusb function.
  *
  * If you do not provide an output location for a context pointer, a default
  * context will be created. If there was already a default context, it will
@@ -1836,7 +1836,7 @@ int API_EXPORTED libusb_init(libusb_context **context)
 		usbi_dbg("created default context");
 	}
 
-	usbi_dbg("libusbx v%d.%d.%d.%d", libusb_version_internal.major, libusb_version_internal.minor,
+	usbi_dbg("libusb v%d.%d.%d.%d", libusb_version_internal.major, libusb_version_internal.minor,
 		libusb_version_internal.micro, libusb_version_internal.nano);
 
 	usbi_mutex_init(&ctx->usb_devs_lock, NULL);
@@ -2152,11 +2152,11 @@ void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level,
 
 	if (global_debug) {
 		header_len = snprintf(buf, sizeof(buf),
-			"[%2d.%06d] [%08x] libusbx: %s [%s] ",
+			"[%2d.%06d] [%08x] libusb: %s [%s] ",
 			(int)now.tv_sec, (int)now.tv_usec, usbi_get_tid(), prefix, function);
 	} else {
 		header_len = snprintf(buf, sizeof(buf),
-			"libusbx: %s [%s] ", prefix, function);
+			"libusb: %s [%s] ", prefix, function);
 	}
 
 	if (header_len < 0 || header_len >= sizeof(buf)) {
@@ -2193,7 +2193,7 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
 }
 
 /** \ingroup misc
- * Returns a constant NULL-terminated string with the ASCII name of a libusbx
+ * Returns a constant NULL-terminated string with the ASCII name of a libusb
  * error or transfer status code. The caller must not free() the returned
  * string.
  *
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index e1c4915..52c9774 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
 /*
- * USB descriptor handling functions for libusbx
+ * USB descriptor handling functions for libusb
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
  *
@@ -541,7 +541,7 @@ int usbi_device_cache_descriptor(libusb_device *dev)
  *
  * This is a non-blocking function; the device descriptor is cached in memory.
  *
- * Note since libusbx-1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102, this
+ * Note since libusb-1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102, this
  * function always succeeds.
  *
  * \param dev the device
diff --git a/libusb/hotplug.c b/libusb/hotplug.c
index 081bc79..04518ea 100644
--- a/libusb/hotplug.c
+++ b/libusb/hotplug.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
 /*
- * Hotplug functions for libusbx
+ * Hotplug functions for libusb
  * Copyright © 2012-2013 Nathan Hjelm <hjelmn@mac.com>
  * Copyright © 2012-2013 Peter Stuge <peter@stuge.se>
  *
@@ -80,7 +80,7 @@
  * are invalid and will remain so even if the device comes back.
  *
  * When handling a LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED event it is considered
- * safe to call any libusbx function that takes a libusb_device. On the other hand,
+ * safe to call any libusb function that takes a libusb_device. On the other hand,
  * when handling a LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT event the only safe function
  * is libusb_get_device_descriptor().
  *
diff --git a/libusb/hotplug.h b/libusb/hotplug.h
index 614ddbc..321a0a8 100644
--- a/libusb/hotplug.h
+++ b/libusb/hotplug.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
 /*
- * Hotplug support for libusbx
+ * Hotplug support for libusb
  * Copyright © 2012-2013 Nathan Hjelm <hjelmn@mac.com>
  * Copyright © 2012-2013 Peter Stuge <peter@stuge.se>
  *
diff --git a/libusb/io.c b/libusb/io.c
index a2c3dda..a9c611d 100644
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
 /*
- * I/O functions for libusbx
+ * I/O functions for libusb
  * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
  *
@@ -43,10 +43,10 @@
  *
  * \section intro Introduction
  *
- * If you're using libusbx in your application, you're probably wanting to
+ * If you're using libusb in your application, you're probably wanting to
  * perform I/O with devices - you want to perform USB data transfers.
  *
- * libusbx offers two separate interfaces for device I/O. This page aims to
+ * libusb offers two separate interfaces for device I/O. This page aims to
  * introduce the two in order to help you decide which one is more suitable
  * for your application. You can also choose to use both interfaces in your
  * application by considering each transfer on a case-by-case basis.
@@ -76,7 +76,7 @@
  * Data will arrive when the button is pressed by the user, which is
  * potentially hours later.
  *
- * libusbx offers both a synchronous and an asynchronous interface to performing
+ * libusb offers both a synchronous and an asynchronous interface to performing
  * USB transfers. The main difference is that the synchronous interface
  * combines both steps indicated above into a single function call, whereas
  * the asynchronous interface separates them.
@@ -131,9 +131,9 @@ if (r == 0 && actual_length == sizeof(data)) {
  * above.
  *
  * Instead of providing which functions that block until the I/O has complete,
- * libusbx's asynchronous interface presents non-blocking functions which
+ * libusb's asynchronous interface presents non-blocking functions which
  * begin a transfer and then return immediately. Your application passes a
- * callback function pointer to this non-blocking function, which libusbx will
+ * callback function pointer to this non-blocking function, which libusb will
  * call with the results of the transaction when it has completed.
  *
  * Transfers which have been submitted through the non-blocking functions
@@ -144,12 +144,12 @@ if (r == 0 && actual_length == sizeof(data)) {
  * to use threads.
  *
  * This added flexibility does come with some complications though:
- * - In the interest of being a lightweight library, libusbx does not create
+ * - In the interest of being a lightweight library, libusb does not create
  * threads and can only operate when your application is calling into it. Your
- * application must call into libusbx from it's main loop when events are ready
- * to be handled, or you must use some other scheme to allow libusbx to
+ * application must call into libusb from it's main loop when events are ready
+ * to be handled, or you must use some other scheme to allow libusb to
  * undertake whatever work needs to be done.
- * - libusbx also needs to be called into at certain fixed points in time in
+ * - libusb also needs to be called into at certain fixed points in time in
  * order to accurately handle transfer timeouts.
  * - Memory handling becomes more complex. You cannot use stack memory unless
  * the function with that stack is guaranteed not to return until the transfer
@@ -159,7 +159,7 @@ if (r == 0 && actual_length == sizeof(data)) {
  * results are handled. This becomes particularly obvious when you want to
  * submit a second transfer based on the results of an earlier transfer.
  *
- * Internally, libusbx's synchronous interface is expressed in terms of function
+ * Internally, libusb's synchronous interface is expressed in terms of function
  * calls to the asynchronous interface.
  *
  * For details on how to use the asynchronous API, see the
@@ -176,25 +176,25 @@ if (r == 0 && actual_length == sizeof(data)) {
  * constraints on packet size defined by endpoint descriptors. The host must
  * not send data payloads larger than the endpoint's maximum packet size.
  *
- * libusbx and the underlying OS abstract out the packet concept, allowing you
+ * libusb and the underlying OS abstract out the packet concept, allowing you
  * to request transfers of any size. Internally, the request will be divided
  * up into correctly-sized packets. You do not have to be concerned with
  * packet sizes, but there is one exception when considering overflows.
  *
  * \section overflow Bulk/interrupt transfer overflows
  *
- * When requesting data on a bulk endpoint, libusbx requires you to supply a
- * buffer and the maximum number of bytes of data that libusbx can put in that
+ * When requesting data on a bulk endpoint, libusb requires you to supply a
+ * buffer and the maximum number of bytes of data that libusb can put in that
  * buffer. However, the size of the buffer is not communicated to the device -
  * the device is just asked to send any amount of data.
  *
  * There is no problem if the device sends an amount of data that is less than
- * or equal to the buffer size. libusbx reports this condition to you through
+ * or equal to the buffer size. libusb reports this condition to you through
  * the \ref libusb_transfer::actual_length "libusb_transfer.actual_length"
  * field.
  *
  * Problems may occur if the device attempts to send more data than can fit in
- * the buffer. libusbx reports LIBUSB_TRANSFER_OVERFLOW for this condition but
+ * the buffer. libusb reports LIBUSB_TRANSFER_OVERFLOW for this condition but
  * other behaviour is largely undefined: actual_length may or may not be
  * accurate, the chunk of data that can fit in the buffer (before overflow)
  * may or may not have been transferred.
@@ -212,7 +212,7 @@ if (r == 0 && actual_length == sizeof(data)) {
 /**
  * @defgroup asyncio Asynchronous device I/O
  *
- * This page details libusbx's asynchronous (non-blocking) API for USB device
+ * This page details libusb's asynchronous (non-blocking) API for USB device
  * I/O. This interface is very powerful but is also quite complex - you will
  * need to read this page carefully to understand the necessary considerations
  * and issues surrounding use of this interface. Simplistic applications
@@ -227,7 +227,7 @@ if (r == 0 && actual_length == sizeof(data)) {
  *
  * \section asyncabstraction Transfer abstraction
  *
- * For the asynchronous I/O, libusbx implements the concept of a generic
+ * For the asynchronous I/O, libusb implements the concept of a generic
  * transfer entity for all types of I/O (control, bulk, interrupt,
  * isochronous). The generic transfer object must be treated slightly
  * differently depending on which type of I/O you are performing with it.
@@ -240,7 +240,7 @@ if (r == 0 && actual_length == sizeof(data)) {
  * -# <b>Allocation</b>: allocate a libusb_transfer
  * -# <b>Filling</b>: populate the libusb_transfer instance with information
  *    about the transfer you wish to perform
- * -# <b>Submission</b>: ask libusbx to submit the transfer
+ * -# <b>Submission</b>: ask libusb to submit the transfer
  * -# <b>Completion handling</b>: examine transfer results in the
  *    libusb_transfer structure
  * -# <b>Deallocation</b>: clean up resources
@@ -287,7 +287,7 @@ if (r == 0 && actual_length == sizeof(data)) {
  *
  * The user-specified callback is passed a pointer to the libusb_transfer
  * structure which was used to setup and submit the transfer. At completion
- * time, libusbx has populated this structure with results of the transfer:
+ * time, libusb has populated this structure with results of the transfer:
  * success or failure reason, number of bytes of data transferred, etc. See
  * the libusb_transfer structure documentation for more information.
  *
@@ -326,7 +326,7 @@ if (r == 0 && actual_length == sizeof(data)) {
  * has completed will result in undefined behaviour.
  *
  * When a transfer is cancelled, some of the data may have been transferred.
- * libusbx will communicate this to you in the transfer callback. Do not assume
+ * libusb will communicate this to you in the transfer callback. Do not assume
  * that no data was transferred.
  *
  * \section bulk_overflows Overflows on device-to-host bulk/interrupt endpoints
@@ -468,7 +468,7 @@ if (r == 0 && actual_length == sizeof(data)) {
  *
  * In most circumstances, it is not safe to use stack memory for transfer
  * buffers. This is because the function that fired off the asynchronous
- * transfer may return before libusbx has finished using the buffer, and when
+ * transfer may return before libusb has finished using the buffer, and when
  * the function returns it's stack gets destroyed. This is true for both
  * host-to-device and device-to-host transfers.
  *
@@ -488,43 +488,43 @@ if (r == 0 && actual_length == sizeof(data)) {
  *   \ref libusb_transfer_status::LIBUSB_TRANSFER_ERROR "LIBUSB_TRANSFER_ERROR"
  *   (they would normally be regarded as COMPLETED)
  * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_BUFFER
- *   "LIBUSB_TRANSFER_FREE_BUFFER" allows you to ask libusbx to free the transfer
+ *   "LIBUSB_TRANSFER_FREE_BUFFER" allows you to ask libusb to free the transfer
  *   buffer when freeing the transfer.
  * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_TRANSFER
- *   "LIBUSB_TRANSFER_FREE_TRANSFER" causes libusbx to automatically free the
+ *   "LIBUSB_TRANSFER_FREE_TRANSFER" causes libusb to automatically free the
  *   transfer after the transfer callback returns.
  *
  * \section asyncevent Event handling
  *
- * An asynchronous model requires that libusbx perform work at various
+ * An asynchronous model requires that libusb perform work at various
  * points in time - namely processing the results of previously-submitted
  * transfers and invoking the user-supplied callback function.
  *
  * This gives rise to the libusb_handle_events() function which your
- * application must call into when libusbx has work do to. This gives libusbx
+ * application must call into when libusb has work do to. This gives libusb
  * the opportunity to reap pending transfers, invoke callbacks, etc.
  *
  * There are 2 different approaches to dealing with libusb_handle_events:
  *
  * -# Repeatedly call libusb_handle_events() in blocking mode from a dedicated
  *    thread.
- * -# Integrate libusbx with your application's main event loop. libusbx
+ * -# Integrate libusb with your application's main event loop. libusb
  *    exposes a set of file descriptors which allow you to do this.
  *
  * The first approach has the big advantage that it will also work on Windows
- * were libusbx' poll API for select / poll integration is not available. So
+ * were libusb' poll API for select / poll integration is not available. So
  * if you want to support Windows and use the async API, you must use this
  * approach, see the \ref eventthread "Using an event handling thread" section
  * below for details.
  *
  * If you prefer a single threaded approach with a single central event loop,
- * see the \ref poll "polling and timing" section for how to integrate libusbx
+ * see the \ref poll "polling and timing" section for how to integrate libusb
  * into your application's main event loop.
  *
  * \section eventthread Using an event handling thread
  *
  * Lets begin with stating the obvious: If you're going to use a separate
- * thread for libusbx event handling, your callback functions MUST be
+ * thread for libusb event handling, your callback functions MUST be
  * threadsafe.
  *
  * Other then that doing event handling from a separate thread, is mostly
@@ -545,7 +545,7 @@ void *event_thread_func(void *ctx)
  * libusb_handle_events() will not return.
  *
  * There are 2 different ways of dealing with this, depending on if your
- * application uses libusbx' \ref hotplug "hotplug" support or not.
+ * application uses libusb' \ref hotplug "hotplug" support or not.
  *
  * Applications which do not use hotplug support, should not start the event
  * thread until after their first call to libusb_open(), and should stop the
@@ -582,7 +582,7 @@ void my_libusb_exit(void)
 /**
  * @defgroup poll Polling and timing
  *
- * This page documents libusbx's functions for polling events and timing.
+ * This page documents libusb's functions for polling events and timing.
  * These functions are only necessary for users of the
  * \ref asyncio "asynchronous API". If you are only using the simpler
  * \ref syncio "synchronous API" then you do not need to ever call these
@@ -590,28 +590,28 @@ void my_libusb_exit(void)
  *
  * The justification for the functionality described here has already been
  * discussed in the \ref asyncevent "event handling" section of the
- * asynchronous API documentation. In summary, libusbx does not create internal
+ * asynchronous API documentation. In summary, libusb does not create internal
  * threads for event processing and hence relies on your application calling
- * into libusbx at certain points in time so that pending events can be handled.
+ * into libusb at certain points in time so that pending events can be handled.
  *
  * Your main loop is probably already calling poll() or select() or a
  * variant on a set of file descriptors for other event sources (e.g. keyboard
  * button presses, mouse movements, network sockets, etc). You then add
- * libusbx's file descriptors to your poll()/select() calls, and when activity
+ * libusb's file descriptors to your poll()/select() calls, and when activity
  * is detected on such descriptors you know it is time to call
  * libusb_handle_events().
  *
- * There is one final event handling complication. libusbx supports
+ * There is one final event handling complication. libusb supports
  * asynchronous transfers which time out after a specified time period.
  *
  * On some platforms a timerfd is used, so the timeout handling is just another
- * fd, on other platforms this requires that libusbx is called into at or after
- * the timeout to handle it. So, in addition to considering libusbx's file
- * descriptors in your main event loop, you must also consider that libusbx
+ * fd, on other platforms this requires that libusb is called into at or after
+ * the timeout to handle it. So, in addition to considering libusb's file
+ * descriptors in your main event loop, you must also consider that libusb
  * sometimes needs to be called into at fixed points in time even when there
  * is no file descriptor activity, see \ref polltime details.
  * 
- * In order to know precisely when libusbx needs to be called into, libusbx
+ * In order to know precisely when libusb needs to be called into, libusb
  * offers you a set of pollable file descriptors and information about when
  * the next timeout expires.
  *
@@ -620,10 +620,10 @@ void my_libusb_exit(void)
  *
  * \section pollsimple The simple option
  *
- * If your application revolves solely around libusbx and does not need to
+ * If your application revolves solely around libusb and does not need to
  * handle other event sources, you can have a program structure as follows:
 \code
-// initialize libusbx
+// initialize libusb
 // find and open device
 // maybe fire off some initial async I/O
 
@@ -646,15 +646,15 @@ while (user_has_not_requested_exit)
  *
  * In more advanced applications, you will already have a main loop which
  * is monitoring other event sources: network sockets, X11 events, mouse
- * movements, etc. Through exposing a set of file descriptors, libusbx is
+ * movements, etc. Through exposing a set of file descriptors, libusb is
  * designed to cleanly integrate into such main loops.
  *
  * In addition to polling file descriptors for the other event sources, you
- * take a set of file descriptors from libusbx and monitor those too. When you
- * detect activity on libusbx's file descriptors, you call
+ * take a set of file descriptors from libusb and monitor those too. When you
+ * detect activity on libusb's file descriptors, you call
  * libusb_handle_events_timeout() in non-blocking mode.
  *
- * What's more, libusbx may also need to handle events at specific moments in
+ * What's more, libusb may also need to handle events at specific moments in
  * time. No file descriptor activity is generated at these times, so your
  * own application needs to be continually aware of when the next one of these
  * moments occurs (through calling libusb_get_next_timeout()), and then it
@@ -662,25 +662,25 @@ while (user_has_not_requested_exit)
  * these moments occur. This means that you need to adjust your
  * poll()/select() timeout accordingly.
  *
- * libusbx provides you with a set of file descriptors to poll and expects you
+ * libusb provides you with a set of file descriptors to poll and expects you
  * to poll all of them, treating them as a single entity. The meaning of each
  * file descriptor in the set is an internal implementation detail,
  * platform-dependent and may vary from release to release. Don't try and
- * interpret the meaning of the file descriptors, just do as libusbx indicates,
+ * interpret the meaning of the file descriptors, just do as libusb indicates,
  * polling all of them at once.
  *
  * In pseudo-code, you want something that looks like:
 \code
-// initialise libusbx
+// initialise libusb
 
 libusb_get_pollfds(ctx)
 while (user has not requested application exit) {
 	libusb_get_next_timeout(ctx);
-	poll(on libusbx file descriptors plus any other event sources of interest,
-		using a timeout no larger than the value libusbx just suggested)
-	if (poll() indicated activity on libusbx file descriptors)
+	poll(on libusb file descriptors plus any other event sources of interest,
+		using a timeout no larger than the value libusb just suggested)
+	if (poll() indicated activity on libusb file descriptors)
 		libusb_handle_events_timeout(ctx, &zero_tv);
-	if (time has elapsed to or beyond the libusbx timeout)
+	if (time has elapsed to or beyond the libusb timeout)
 		libusb_handle_events_timeout(ctx, &zero_tv);
 	// handle events from other sources here
 }
@@ -690,7 +690,7 @@ while (user has not requested application exit) {
  *
  * \subsection polltime Notes on time-based events
  *
- * The above complication with having to track time and call into libusbx at
+ * The above complication with having to track time and call into libusb at
  * specific moments is a bit of a headache. For maximum compatibility, you do
  * need to write your main loop as above, but you may decide that you can
  * restrict the supported platforms of your application and get away with
@@ -702,18 +702,18 @@ while (user has not requested application exit) {
  *  - Linux, provided that the following version requirements are satisfied:
  *   - Linux v2.6.27 or newer, compiled with timerfd support
  *   - glibc v2.9 or newer
- *   - libusbx v1.0.5 or newer
+ *   - libusb v1.0.5 or newer
  *
  * Under these configurations, libusb_get_next_timeout() will \em always return
  * 0, so your main loop can be simplified to:
 \code
-// initialise libusbx
+// initialise libusb
 
 libusb_get_pollfds(ctx)
 while (user has not requested application exit) {
-	poll(on libusbx file descriptors plus any other event sources of interest,
+	poll(on libusb file descriptors plus any other event sources of interest,
 		using any timeout that you like)
-	if (poll() indicated activity on libusbx file descriptors)
+	if (poll() indicated activity on libusb file descriptors)
 		libusb_handle_events_timeout(ctx, &zero_tv);
 	// handle events from other sources here
 }
@@ -723,20 +723,20 @@ while (user has not requested application exit) {
  *
  * Do remember that if you simplify your main loop to the above, you will
  * lose compatibility with some platforms (including legacy Linux platforms,
- * and <em>any future platforms supported by libusbx which may have time-based
+ * and <em>any future platforms supported by libusb which may have time-based
  * event requirements</em>). The resultant problems will likely appear as
  * strange bugs in your application.
  *
  * You can use the libusb_pollfds_handle_timeouts() function to do a runtime
  * check to see if it is safe to ignore the time-based event complications.
- * If your application has taken the shortcut of ignoring libusbx's next timeout
+ * If your application has taken the shortcut of ignoring libusb's next timeout
  * in your main loop, then you are advised to check the return value of
  * libusb_pollfds_handle_timeouts() during application startup, and to abort
  * if the platform does suffer from these timing complications.
  *
  * \subsection fdsetchange Changes in the file descriptor set
  *
- * The set of file descriptors that libusbx uses as event sources may change
+ * The set of file descriptors that libusb uses as event sources may change
  * during the life of your application. Rather than having to repeatedly
  * call libusb_get_pollfds(), you can set up notification functions for when
  * the file descriptor set changes using libusb_set_pollfd_notifiers().
@@ -757,10 +757,10 @@ while (user has not requested application exit) {
 
 /** \page mtasync Multi-threaded applications and asynchronous I/O
  *
- * libusbx is a thread-safe library, but extra considerations must be applied
- * to applications which interact with libusbx from multiple threads.
+ * libusb is a thread-safe library, but extra considerations must be applied
+ * to applications which interact with libusb from multiple threads.
  *
- * The underlying issue that must be addressed is that all libusbx I/O
+ * The underlying issue that must be addressed is that all libusb I/O
  * revolves around monitoring file descriptors through the poll()/select()
  * system calls. This is directly exposed at the
  * \ref asyncio "asynchronous interface" but it is important to note that the
@@ -768,13 +768,13 @@ while (user has not requested application exit) {
  * asynchonrous interface, therefore the same considerations apply.
  *
  * The issue is that if two or more threads are concurrently calling poll()
- * or select() on libusbx's file descriptors then only one of those threads
+ * or select() on libusb's file descriptors then only one of those threads
  * will be woken up when an event arrives. The others will be completely
  * oblivious that anything has happened.
  *
  * Consider the following pseudo-code, which submits an asynchronous transfer
  * then waits for its completion. This style is one way you could implement a
- * synchronous interface on top of the asynchronous interface (and libusbx
+ * synchronous interface on top of the asynchronous interface (and libusb
  * does something similar, albeit more advanced due to the complications
  * explained on this page).
  *
@@ -797,7 +797,7 @@ void myfunc() {
 	libusb_submit_transfer(transfer);
 
 	while (!completed) {
-		poll(libusbx file descriptors, 120*1000);
+		poll(libusb file descriptors, 120*1000);
 		if (poll indicates activity)
 			libusb_handle_events_timeout(ctx, &zero_tv);
 	}
@@ -811,7 +811,7 @@ void myfunc() {
  * The poll() loop has a long timeout to minimize CPU usage during situations
  * when nothing is happening (it could reasonably be unlimited).
  *
- * If this is the only thread that is polling libusbx's file descriptors, there
+ * If this is the only thread that is polling libusb's file descriptors, there
  * is no problem: there is no danger that another thread will swallow up the
  * event that we are interested in. On the other hand, if there is another
  * thread polling the same descriptors, there is a chance that it will receive
@@ -823,13 +823,13 @@ void myfunc() {
  *
  * The solution here is to ensure that no two threads are ever polling the
  * file descriptors at the same time. A naive implementation of this would
- * impact the capabilities of the library, so libusbx offers the scheme
+ * impact the capabilities of the library, so libusb offers the scheme
  * documented below to ensure no loss of functionality.
  *
  * Before we go any further, it is worth mentioning that all libusb-wrapped
  * event handling procedures fully adhere to the scheme documented below.
  * This includes libusb_handle_events() and its variants, and all the
- * synchronous I/O functions - libusbx hides this headache from you.
+ * synchronous I/O functions - libusb hides this headache from you.
  *
  * \section Using libusb_handle_events() from multiple threads
  *
@@ -875,17 +875,17 @@ void myfunc() {
  *
  * \section eventlock The events lock
  *
- * The problem is when we consider the fact that libusbx exposes file
+ * The problem is when we consider the fact that libusb exposes file
  * descriptors to allow for you to integrate asynchronous USB I/O into
  * existing main loops, effectively allowing you to do some work behind
- * libusbx's back. If you do take libusbx's file descriptors and pass them to
+ * libusb's back. If you do take libusb's file descriptors and pass them to
  * poll()/select() yourself, you need to be aware of the associated issues.
  *
  * The first concept to be introduced is the events lock. The events lock
  * is used to serialize threads that want to handle events, such that only
  * one thread is handling events at any one time.
  *
- * You must take the events lock before polling libusbx file descriptors,
+ * You must take the events lock before polling libusb file descriptors,
  * using libusb_lock_events(). You must release the lock as soon as you have
  * aborted your poll()/select() loop, using libusb_unlock_events().
  *
@@ -896,7 +896,7 @@ void myfunc() {
 \code
 	libusb_lock_events(ctx);
 	while (!completed) {
-		poll(libusbx file descriptors, 120*1000);
+		poll(libusb file descriptors, 120*1000);
 		if (poll indicates activity)
 			libusb_handle_events_timeout(ctx, &zero_tv);
 	}
@@ -912,7 +912,7 @@ void myfunc() {
  * status of its transfer until the code above has finished (30 seconds later)
  * due to contention on the lock.
  *
- * To solve this, libusbx offers you a mechanism to determine when another
+ * To solve this, libusb offers you a mechanism to determine when another
  * thread is handling events. It also offers a mechanism to block your thread
  * until the event handling thread has completed an event (and this mechanism
  * does not involve polling of file descriptors).
@@ -938,7 +938,7 @@ if (libusb_try_lock_events(ctx) == 0) {
 			libusb_unlock_events(ctx);
 			goto retry;
 		}
-		poll(libusbx file descriptors, 120*1000);
+		poll(libusb file descriptors, 120*1000);
 		if (poll indicates activity)
 			libusb_handle_events_locked(ctx, 0);
 	}
@@ -984,8 +984,8 @@ printf("completed!\n");
  * should be apparent from the code shown above.
  * -# libusb_try_lock_events() is a non-blocking function which attempts
  *    to acquire the events lock but returns a failure code if it is contended.
- * -# libusb_event_handling_ok() checks that libusbx is still happy for your
- *    thread to be performing event handling. Sometimes, libusbx needs to
+ * -# libusb_event_handling_ok() checks that libusb is still happy for your
+ *    thread to be performing event handling. Sometimes, libusb needs to
  *    interrupt the event handler, and this is how you can check if you have
  *    been interrupted. If this function returns 0, the correct behaviour is
  *    for you to give up the event handling lock, and then to repeat the cycle.
@@ -995,12 +995,12 @@ printf("completed!\n");
  *    libusb_handle_events_timeout() that you can call while holding the
  *    events lock. libusb_handle_events_timeout() itself implements similar
  *    logic to the above, so be sure not to call it when you are
- *    "working behind libusbx's back", as is the case here.
+ *    "working behind libusb's back", as is the case here.
  * -# libusb_event_handler_active() determines if someone is currently
  *    holding the events lock
  *
  * You might be wondering why there is no function to wake up all threads
- * blocked on libusb_wait_for_event(). This is because libusbx can do this
+ * blocked on libusb_wait_for_event(). This is because libusb can do this
  * internally: it will wake up all such threads when someone calls
  * libusb_unlock_events() or when a transfer completes (at the point after its
  * callback has returned).
@@ -1009,7 +1009,7 @@ printf("completed!\n");
  *
  * The above explanation should be enough to get you going, but if you're
  * really thinking through the issues then you may be left with some more
- * questions regarding libusbx's internals. If you're curious, read on, and if
+ * questions regarding libusb's internals. If you're curious, read on, and if
  * not, skip to the next section to avoid confusing yourself!
  *
  * The immediate question that may spring to mind is: what if one thread
@@ -1024,14 +1024,14 @@ printf("completed!\n");
  *    are all kinds of race conditions that could arise here, so it is
  *    important that nobody is doing event handling at this time.
  *
- * libusbx handles these issues internally, so application developers do not
+ * libusb handles these issues internally, so application developers do not
  * have to stop their event handlers while opening/closing devices. Here's how
  * it works, focusing on the libusb_close() situation first:
  *
- * -# During initialization, libusbx opens an internal pipe, and it adds the read
+ * -# During initialization, libusb opens an internal pipe, and it adds the read
  *    end of this pipe to the set of file descriptors to be polled.
- * -# During libusb_close(), libusbx writes some dummy data on this control pipe.
- *    This immediately interrupts the event handler. libusbx also records
+ * -# During libusb_close(), libusb writes some dummy data on this control pipe.
+ *    This immediately interrupts the event handler. libusb also records
  *    internally that it is trying to interrupt event handlers for this
  *    high-priority event.
  * -# At this point, some of the functions described above start behaving
@@ -1046,7 +1046,7 @@ printf("completed!\n");
  *    giving up the events lock very quickly, giving the high-priority
  *    libusb_close() operation a "free ride" to acquire the events lock. All
  *    threads that are competing to do event handling become event waiters.
- * -# With the events lock held inside libusb_close(), libusbx can safely remove
+ * -# With the events lock held inside libusb_close(), libusb can safely remove
  *    a file descriptor from the poll set, in the safety of knowledge that
  *    nobody is polling those descriptors or trying to access the poll set.
  * -# After obtaining the events lock, the close operation completes very
@@ -1063,7 +1063,7 @@ printf("completed!\n");
  * call to libusb_open():
  *
  * -# The device is opened and a file descriptor is added to the poll set.
- * -# libusbx sends some dummy data on the control pipe, and records that it
+ * -# libusb sends some dummy data on the control pipe, and records that it
  *    is trying to modify the poll descriptor set.
  * -# The event handler is interrupted, and the same behaviour change as for
  *    libusb_close() takes effect, causing all event handling threads to become
@@ -1079,7 +1079,7 @@ printf("completed!\n");
  *
  * The above may seem a little complicated, but hopefully I have made it clear
  * why such complications are necessary. Also, do not forget that this only
- * applies to applications that take libusbx's file descriptors and integrate
+ * applies to applications that take libusb's file descriptors and integrate
  * them into their own polling loops.
  *
  * You may decide that it is OK for your multi-threaded application to ignore
@@ -1291,7 +1291,7 @@ out:
 }
 
 /** \ingroup asyncio
- * Allocate a libusbx transfer with a specified number of isochronous packet
+ * Allocate a libusb transfer with a specified number of isochronous packet
  * descriptors. The returned transfer is pre-initialized for you. When the new
  * transfer is no longer needed, it should be freed with
  * libusb_free_transfer().
@@ -1589,11 +1589,11 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer)
 
 /** \ingroup poll
  * Attempt to acquire the event handling lock. This lock is used to ensure that
- * only one thread is monitoring libusbx event sources at any one time.
+ * only one thread is monitoring libusb event sources at any one time.
  *
  * You only need to use this lock if you are developing an application
- * which calls poll() or select() on libusbx's file descriptors directly.
- * If you stick to libusbx's event handling loop functions (e.g.
+ * which calls poll() or select() on libusb's file descriptors directly.
+ * If you stick to libusb's event handling loop functions (e.g.
  * libusb_handle_events()) then you do not need to be concerned with this
  * locking.
  *
@@ -1633,11 +1633,11 @@ int API_EXPORTED libusb_try_lock_events(libusb_context *ctx)
 /** \ingroup poll
  * Acquire the event handling lock, blocking until successful acquisition if
  * it is contended. This lock is used to ensure that only one thread is
- * monitoring libusbx event sources at any one time.
+ * monitoring libusb event sources at any one time.
  *
  * You only need to use this lock if you are developing an application
- * which calls poll() or select() on libusbx's file descriptors directly.
- * If you stick to libusbx's event handling loop functions (e.g.
+ * which calls poll() or select() on libusb's file descriptors directly.
+ * If you stick to libusb's event handling loop functions (e.g.
  * libusb_handle_events()) then you do not need to be concerned with this
  * locking.
  *
@@ -1680,7 +1680,7 @@ void API_EXPORTED libusb_unlock_events(libusb_context *ctx)
 /** \ingroup poll
  * Determine if it is still OK for this thread to be doing event handling.
  *
- * Sometimes, libusbx needs to temporarily pause all event handlers, and this
+ * Sometimes, libusb needs to temporarily pause all event handlers, and this
  * is the function you should use before polling file descriptors to see if
  * this is the case.
  *
@@ -1754,9 +1754,9 @@ int API_EXPORTED libusb_event_handler_active(libusb_context *ctx)
  * events, then call libusb_wait_for_event().
  *
  * You only need to use this lock if you are developing an application
- * which calls poll() or select() on libusbx's file descriptors directly,
+ * which calls poll() or select() on libusb's file descriptors directly,
  * <b>and</b> may potentially be handling events from 2 threads simultaenously.
- * If you stick to libusbx's event handling loop functions (e.g.
+ * If you stick to libusb's event handling loop functions (e.g.
  * libusb_handle_events()) then you do not need to be concerned with this
  * locking.
  *
@@ -2093,7 +2093,7 @@ static int get_next_timeout(libusb_context *ctx, struct timeval *tv,
 /** \ingroup poll
  * Handle any pending events.
  *
- * libusbx determines "pending events" by checking if any timeouts have expired
+ * libusb determines "pending events" by checking if any timeouts have expired
  * and by checking the set of file descriptors for activity.
  *
  * If a zero timeval is passed, this function will handle any already-pending
@@ -2242,9 +2242,9 @@ int API_EXPORTED libusb_handle_events_completed(libusb_context *ctx,
  * held, see libusb_lock_events().
  *
  * This function is designed to be called under the situation where you have
- * taken the event lock and are calling poll()/select() directly on libusbx's
+ * taken the event lock and are calling poll()/select() directly on libusb's
  * file descriptors (as opposed to using libusb_handle_events() or similar).
- * You detect events on libusbx's descriptors, so you then call this function
+ * You detect events on libusb's descriptors, so you then call this function
  * with a zero timeout value (while still holding the event lock).
  *
  * \param ctx the context to operate on, or NULL for the default context
@@ -2271,19 +2271,19 @@ int API_EXPORTED libusb_handle_events_locked(libusb_context *ctx,
 
 /** \ingroup poll
  * Determines whether your application must apply special timing considerations
- * when monitoring libusbx's file descriptors.
+ * when monitoring libusb's file descriptors.
  *
  * This function is only useful for applications which retrieve and poll
- * libusbx's file descriptors in their own main loop (\ref pollmain).
+ * libusb's file descriptors in their own main loop (\ref pollmain).
  *
- * Ordinarily, libusbx's event handler needs to be called into at specific
+ * Ordinarily, libusb's event handler needs to be called into at specific
  * moments in time (in addition to times when there is activity on the file
  * descriptor set). The usual approach is to use libusb_get_next_timeout()
  * to learn about when the next timeout occurs, and to adjust your
  * poll()/select() timeout accordingly so that you can make a call into the
  * library at that time.
  *
- * Some platforms supported by libusbx do not come with this baggage - any
+ * Some platforms supported by libusb do not come with this baggage - any
  * events relevant to timing will be represented by activity on the file
  * descriptor set, and libusb_get_next_timeout() will always return 0.
  * This function allows you to detect whether you are running on such a
@@ -2292,10 +2292,10 @@ int API_EXPORTED libusb_handle_events_locked(libusb_context *ctx,
  * Since v1.0.5.
  *
  * \param ctx the context to operate on, or NULL for the default context
- * \returns 0 if you must call into libusbx at times determined by
+ * \returns 0 if you must call into libusb at times determined by
  * libusb_get_next_timeout(), or 1 if all timeout events are handled internally
  * or through regular activity on the file descriptors.
- * \see \ref pollmain "Polling libusbx file descriptors for event handling"
+ * \see \ref pollmain "Polling libusb file descriptors for event handling"
  */
 int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx)
 {
@@ -2309,21 +2309,21 @@ int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx)
 }
 
 /** \ingroup poll
- * Determine the next internal timeout that libusbx needs to handle. You only
+ * Determine the next internal timeout that libusb needs to handle. You only
  * need to use this function if you are calling poll() or select() or similar
- * on libusbx's file descriptors yourself - you do not need to use it if you
+ * on libusb's file descriptors yourself - you do not need to use it if you
  * are calling libusb_handle_events() or a variant directly.
  *
  * You should call this function in your main loop in order to determine how
- * long to wait for select() or poll() to return results. libusbx needs to be
+ * long to wait for select() or poll() to return results. libusb needs to be
  * called into at this timeout, so you should use it as an upper bound on
  * your select() or poll() call.
  *
  * When the timeout has expired, call into libusb_handle_events_timeout()
- * (perhaps in non-blocking mode) so that libusbx can handle the timeout.
+ * (perhaps in non-blocking mode) so that libusb can handle the timeout.
  *
  * This function may return 1 (success) and an all-zero timeval. If this is
- * the case, it indicates that libusbx has a timeout that has already expired
+ * the case, it indicates that libusb has a timeout that has already expired
  * so you should call libusb_handle_events_timeout() or similar immediately.
  * A return code of 0 indicates that there are no pending timeouts.
  *
@@ -2332,7 +2332,7 @@ int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx)
  *
  * \param ctx the context to operate on, or NULL for the default context
  * \param tv output location for a relative time against the current
- * clock in which libusbx must be called into in order to process timeout events
+ * clock in which libusb must be called into in order to process timeout events
  * \returns 0 if there are no pending timeouts, 1 if a timeout was returned,
  * or LIBUSB_ERROR_OTHER on failure
  */
@@ -2399,7 +2399,7 @@ int API_EXPORTED libusb_get_next_timeout(libusb_context *ctx,
 /** \ingroup poll
  * Register notification functions for file descriptor additions/removals.
  * These functions will be invoked for every new or removed file descriptor
- * that libusbx uses as an event source.
+ * that libusb uses as an event source.
  *
  * To remove notifiers, pass NULL values for the function pointers.
  *
@@ -2477,7 +2477,7 @@ void usbi_remove_pollfd(struct libusb_context *ctx, int fd)
 
 /** \ingroup poll
  * Retrieve a list of file descriptors that should be polled by your main loop
- * as libusbx event sources.
+ * as libusb event sources.
  *
  * The returned list is NULL-terminated and should be freed with free() when
  * done. The actual list contents must not be touched.
@@ -2517,7 +2517,7 @@ out:
 	usbi_mutex_unlock(&ctx->pollfds_lock);
 	return (const struct libusb_pollfd **) ret;
 #else
-	usbi_err(ctx, "external polling of libusbx's internal descriptors "\
+	usbi_err(ctx, "external polling of libusb's internal descriptors "\
 		"is not yet supported on Windows platforms");
 	return NULL;
 #endif
diff --git a/libusb/libusb-1.0.rc b/libusb/libusb-1.0.rc
index ae49757..3dce6d5 100644
--- a/libusb/libusb-1.0.rc
+++ b/libusb/libusb-1.0.rc
@@ -41,7 +41,7 @@ BEGIN
 	BEGIN
 		BLOCK "040904b0"
 		BEGIN
-			VALUE "CompanyName", "libusbx.org\0"
+			VALUE "CompanyName", "libusb.info\0"
 			VALUE "FileDescription", "C library for writing portable USB drivers in userspace\0"
 			VALUE "FileVersion", LIBUSB_VERSIONSTRING
 			VALUE "InternalName", "libusb\0"
diff --git a/libusb/libusb.h b/libusb/libusb.h
index 8267ee3..a4763e1 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -1,10 +1,10 @@
 /*
- * Public libusbx header file
+ * Public libusb header file
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
  * Copyright © 2007-2008 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2012 Pete Batard <pete@akeo.ie>
  * Copyright © 2012 Nathan Hjelm <hjelmn@cs.unm.edu>
- * For more information, please visit: http://libusbx.org
+ * For more information, please visit: http://libusb.info
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -62,7 +62,7 @@ typedef unsigned __int32  uint32_t;
 #include <limits.h>
 
 /* 'interface' might be defined as a macro on Windows, so we need to
- * undefine it so as not to break the current libusbx API, because
+ * undefine it so as not to break the current libusb API, because
  * libusb_config_descriptor has an 'interface' member
  * As this can be problematic if you include windows.h after libusb.h
  * in your sources, we force windows.h to be included first. */
@@ -85,14 +85,14 @@ typedef unsigned __int32  uint32_t;
 
 /** \def LIBUSB_CALL
  * \ingroup misc
- * libusbx's Windows calling convention.
+ * libusb's Windows calling convention.
  *
  * Under Windows, the selection of available compilers and configurations
  * means that, unlike other platforms, there is not <em>one true calling
  * convention</em> (calling convention: the manner in which parameters are
  * passed to funcions in the generated assembly code).
  *
- * Matching the Windows API itself, libusbx uses the WINAPI convention (which
+ * Matching the Windows API itself, libusb uses the WINAPI convention (which
  * translates to the <tt>stdcall</tt> convention) and guarantees that the
  * library is compiled in this way. The public header file also includes
  * appropriate annotations so that your own software will use the right
@@ -100,7 +100,7 @@ typedef unsigned __int32  uint32_t;
  * your codebase.
  *
  * The one consideration that you must apply in your software is to mark
- * all functions which you use as libusbx callbacks with this LIBUSB_CALL
+ * all functions which you use as libusb callbacks with this LIBUSB_CALL
  * annotation, so that they too get compiled for the correct calling
  * convention.
  *
@@ -108,7 +108,7 @@ typedef unsigned __int32  uint32_t;
  * means that you can apply it to your code without worrying about
  * cross-platform compatibility.
  */
-/* LIBUSB_CALL must be defined on both definition and declaration of libusbx
+/* LIBUSB_CALL must be defined on both definition and declaration of libusb
  * functions. You'd think that declaration would be enough, but cygwin will
  * complain about conflicting types unless both are marked this way.
  * The placement of this macro is important too; it must appear after the
@@ -121,30 +121,33 @@ typedef unsigned __int32  uint32_t;
 #define LIBUSB_CALL
 #endif
 
-/** \def LIBUSBX_API_VERSION
+/** \def LIBUSB_API_VERSION
  * \ingroup misc
- * libusbx's API version.
+ * libusb's API version.
  *
- * Since version 1.0.13, to help with feature detection, libusbx defines
- * a LIBUSBX_API_VERSION macro that gets increased every time there is a
+ * Since version 1.0.13, to help with feature detection, libusb defines
+ * a LIBUSB_API_VERSION macro that gets increased every time there is a
  * significant change to the API, such as the introduction of a new call,
  * the definition of a new macro/enum member, or any other element that
- * libusbx applications may want to detect at compilation time.
+ * libusb applications may want to detect at compilation time.
  *
  * The macro is typically used in an application as follows:
  * \code
- * #if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01001234)
- * // Use one of the newer features from the libusbx API
+ * #if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01001234)
+ * // Use one of the newer features from the libusb API
  * #endif
  * \endcode
  *
- * Another feature of LIBUSBX_API_VERSION is that it can be used to detect
- * whether you are compiling against the libusb or the libusbx library.
+ * Another feature of LIBUSB_API_VERSION is that it can be used to detect
+ * whether you are compiling against the libusb or the libusb library.
  *
- * Internally, LIBUSBX_API_VERSION is defined as follows:
- * (libusbx major << 24) | (libusbx minor << 16) | (16 bit incremental)
+ * Internally, LIBUSB_API_VERSION is defined as follows:
+ * (libusb major << 24) | (libusb minor << 16) | (16 bit incremental)
  */
-#define LIBUSBX_API_VERSION 0x01000102
+#define LIBUSB_API_VERSION 0x01000102
+
+/* The following is kept for compatibility, but will be deprecated in the future */
+#define LIBUSBX_API_VERSION LIBUSB_API_VERSION
 
 #ifdef __cplusplus
 extern "C" {
@@ -562,7 +565,7 @@ struct libusb_endpoint_descriptor {
 	/** For audio devices only: the address if the synch endpoint */
 	uint8_t  bSynchAddress;
 
-	/** Extra descriptors. If libusbx encounters unknown endpoint descriptors,
+	/** Extra descriptors. If libusb encounters unknown endpoint descriptors,
 	 * it will store them here, should you wish to parse them. */
 	const unsigned char *extra;
 
@@ -612,7 +615,7 @@ struct libusb_interface_descriptor {
 	 * by the bNumEndpoints field. */
 	const struct libusb_endpoint_descriptor *endpoint;
 
-	/** Extra descriptors. If libusbx encounters unknown interface descriptors,
+	/** Extra descriptors. If libusb encounters unknown interface descriptors,
 	 * it will store them here, should you wish to parse them. */
 	const unsigned char *extra;
 
@@ -670,7 +673,7 @@ struct libusb_config_descriptor {
 	 * this array is determined by the bNumInterfaces field. */
 	const struct libusb_interface *interface;
 
-	/** Extra descriptors. If libusbx encounters unknown configuration
+	/** Extra descriptors. If libusb encounters unknown configuration
 	 * descriptors, it will store them here, should you wish to parse them. */
 	const unsigned char *extra;
 
@@ -889,7 +892,7 @@ struct libusb_control_setup {
 
 #define LIBUSB_CONTROL_SETUP_SIZE (sizeof(struct libusb_control_setup))
 
-/* libusbx */
+/* libusb */
 
 struct libusb_context;
 struct libusb_device;
@@ -897,7 +900,7 @@ struct libusb_device_handle;
 struct libusb_hotplug_callback;
 
 /** \ingroup lib
- * Structure providing the version of the libusbx runtime
+ * Structure providing the version of the libusb runtime
  */
 struct libusb_version {
 	/** Library major version. */
@@ -920,16 +923,16 @@ struct libusb_version {
 };
 
 /** \ingroup lib
- * Structure representing a libusbx session. The concept of individual libusbx
+ * Structure representing a libusb session. The concept of individual libusb
  * sessions allows for your program to use two libraries (or dynamically
  * load two modules) which both independently use libusb. This will prevent
- * interference between the individual libusbx users - for example
+ * interference between the individual libusb users - for example
  * libusb_set_debug() will not affect the other user of the library, and
  * libusb_exit() will not destroy resources that the other user is still
  * using.
  *
  * Sessions are created by libusb_init() and destroyed through libusb_exit().
- * If your application is guaranteed to only ever include a single libusbx
+ * If your application is guaranteed to only ever include a single libusb
  * user (i.e. you), you do not have to worry about contexts: pass NULL in
  * every function call where a context is required. The default context
  * will be used.
@@ -1042,7 +1045,7 @@ enum libusb_bos_type {
 };
 
 /** \ingroup misc
- * Error codes. Most libusbx functions return 0 on success or one of these
+ * Error codes. Most libusb functions return 0 on success or one of these
  * codes on failure.
  * You can call libusb_error_name() to retrieve a string representation of an
  * error code or libusb_strerror() to get an end-user suitable description of
@@ -1188,7 +1191,7 @@ struct libusb_transfer;
  * Asynchronous transfer callback function type. When submitting asynchronous
  * transfers, you pass a pointer to a callback function of this type via the
  * \ref libusb_transfer::callback "callback" member of the libusb_transfer
- * structure. libusbx will call this function later, when the transfer has
+ * structure. libusb will call this function later, when the transfer has
  * completed or failed. See \ref asyncio for more information.
  * \param transfer The libusb_transfer struct the callback function is being
  * notified about.
@@ -1271,7 +1274,7 @@ enum libusb_capability {
 	LIBUSB_CAP_HAS_HOTPLUG = 0x0001,
 	/** The library can access HID devices without requiring user intervention.
 	 * Note that before being able to actually access an HID device, you may
-	 * still have to call additional libusbx functions such as
+	 * still have to call additional libusb functions such as
 	 * \ref libusb_detach_kernel_driver(). */
 	LIBUSB_CAP_HAS_HID_ACCESS = 0x0100,
 	/** The library supports detaching of the default USB driver, using 
@@ -1871,7 +1874,7 @@ typedef enum {
  * This callback may be called by an internal event thread and as such it is
  * recommended the callback do minimal processing before returning.
  *
- * libusbx will call this function later, when a matching event had happened on
+ * libusb will call this function later, when a matching event had happened on
  * a matching device. See \ref hotplug for more information.
  *
  * It is safe to call either libusb_hotplug_register_callback() or
@@ -1901,7 +1904,7 @@ typedef int (LIBUSB_CALL *libusb_hotplug_callback_fn)(libusb_context *ctx,
  *
  * If the \ref LIBUSB_HOTPLUG_ENUMERATE is passed the callback will be
  * called with a \ref LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED for all devices
- * already plugged into the machine. Note that libusbx modifies its internal
+ * already plugged into the machine. Note that libusb modifies its internal
  * device list from a separate thread, while calling hotplug callbacks from
  * libusb_handle_events(), so it is possible for a device to already be present
  * on, or removed from, its internal device list, while the hotplug callbacks
diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index 5cf5425..7db9c59 100644
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -1,5 +1,5 @@
 /*
- * Internal header for libusbx
+ * Internal header for libusb
  * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
  *
@@ -39,11 +39,11 @@
 #include "libusb.h"
 #include "version.h"
 
-/* Inside the libusbx code, mark all public functions as follows:
+/* Inside the libusb code, mark all public functions as follows:
  *   return_type API_EXPORTED function_name(params) { ... }
  * But if the function returns a pointer, mark it as follows:
  *   DEFAULT_VISIBILITY return_type * LIBUSB_CALL function_name(params) { ... }
- * In the libusbx public header, mark all declarations as:
+ * In the libusb public header, mark all declarations as:
  *   return_type LIBUSB_CALL function_name(params);
  */
 #define API_EXPORTED LIBUSB_CALL DEFAULT_VISIBILITY
@@ -512,7 +512,7 @@ struct usbi_os_backend {
 	 * to determine specific capabilities of the system, allocate required
 	 * data structures for later, etc.
 	 *
-	 * This function is called when a libusbx user initializes the library
+	 * This function is called when a libusb user initializes the library
 	 * prior to use.
 	 *
 	 * Return 0 on success, or a LIBUSB_ERROR code on failure.
@@ -542,7 +542,7 @@ struct usbi_os_backend {
 	 * but that is an unlikely case.
 	 *
 	 * After computing a session ID for a device, call
-	 * usbi_get_device_by_session_id(). This function checks if libusbx already
+	 * usbi_get_device_by_session_id(). This function checks if libusb already
 	 * knows about the device, and if so, it provides you with a reference
 	 * to a libusb_device structure for it.
 	 *
@@ -603,7 +603,7 @@ struct usbi_os_backend {
 	 *
 	 * Your backend should allocate any internal resources required for I/O
 	 * and other operations so that those operations can happen (hopefully)
-	 * without hiccup. This is also a good place to inform libusbx that it
+	 * without hiccup. This is also a good place to inform libusb that it
 	 * should monitor certain file descriptors related to this device -
 	 * see the usbi_add_pollfd() function.
 	 *
@@ -627,7 +627,7 @@ struct usbi_os_backend {
 	/* Close a device such that the handle cannot be used again. Your backend
 	 * should destroy any resources that were allocated in the open path.
 	 * This may also be a good place to call usbi_remove_pollfd() to inform
-	 * libusbx of any file descriptors associated with this device that should
+	 * libusb of any file descriptors associated with this device that should
 	 * no longer be monitored.
 	 *
 	 * This function is called when the user closes a device handle.
@@ -728,7 +728,7 @@ struct usbi_os_backend {
 	 *
 	 * If you cannot retrieve this from cache, either do not implement this
 	 * function, or return LIBUSB_ERROR_NOT_SUPPORTED. This will cause
-	 * libusbx to retrieve the information through a standard control transfer.
+	 * libusb to retrieve the information through a standard control transfer.
 	 *
 	 * This function must be non-blocking.
 	 * Return:
@@ -927,7 +927,7 @@ struct usbi_os_backend {
 	 * all private data from the transfer as if you were just about to report
 	 * completion or cancellation.
 	 *
-	 * This function might seem a bit out of place. It is used when libusbx
+	 * This function might seem a bit out of place. It is used when libusb
 	 * detects a disconnected device - it calls this function for all pending
 	 * transfers before reporting completion (with the disconnect code) to
 	 * the user. Maybe we can improve upon this internal interface in future.
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index 204e1ef..dd62210 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode:nil -*- */
 /*
- * darwin backend for libusbx 1.0
+ * darwin backend for libusb 1.0
  * Copyright © 2008-2013 Nathan Hjelm <hjelmn@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -1429,7 +1429,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) {
 
   IOReturn               ret;
   uint8_t                transferType;
-  /* None of the values below are used in libusbx for bulk transfers */
+  /* None of the values below are used in libusb for bulk transfers */
   uint8_t                direction, number, interval, pipeRef, iface;
   uint16_t               maxPacketSize;
 
@@ -1507,7 +1507,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) {
       return LIBUSB_ERROR_NO_MEM;
   }
 
-  /* copy the frame list from the libusbx descriptor (the structures differ only is member order) */
+  /* copy the frame list from the libusb descriptor (the structures differ only is member order) */
   for (i = 0 ; i < transfer->num_iso_packets ; i++)
     tpriv->isoc_framelist[i].frReqCount = transfer->iso_packet_desc[i].length;
 
@@ -1588,7 +1588,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) {
   tpriv->req.wValue            = OSSwapLittleToHostInt16 (setup->wValue);
   tpriv->req.wIndex            = OSSwapLittleToHostInt16 (setup->wIndex);
   tpriv->req.wLength           = OSSwapLittleToHostInt16 (setup->wLength);
-  /* data is stored after the libusbx control block */
+  /* data is stored after the libusb control block */
   tpriv->req.pData             = transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE;
   tpriv->req.completionTimeout = transfer->timeout;
   tpriv->req.noDataTimeout     = transfer->timeout;
diff --git a/libusb/os/darwin_usb.h b/libusb/os/darwin_usb.h
index 53b8542..3fa0187 100644
--- a/libusb/os/darwin_usb.h
+++ b/libusb/os/darwin_usb.h
@@ -1,5 +1,5 @@
 /*
- * darwin backend for libusbx 1.0
+ * darwin backend for libusb 1.0
  * Copyright © 2008-2013 Nathan Hjelm <hjelmn@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index a95d099..50c9161 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset:8 ; indent-tabs-mode:t -*- */
 /*
- * Linux usbfs backend for libusbx
+ * Linux usbfs backend for libusb
  * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
  * Copyright © 2013 Nathan Hjelm <hjelmn@mac.com>
@@ -197,10 +197,10 @@ static int _get_usbfs_fd(struct libusb_device *dev, mode_t mode, int silent)
 		return fd; /* Success */
 
 	if (!silent) {
-		usbi_err(ctx, "libusbx couldn't open USB device %s: %s",
+		usbi_err(ctx, "libusb couldn't open USB device %s: %s",
 			 path, strerror(errno));
 		if (errno == EACCES && mode == O_RDWR)
-			usbi_err(ctx, "libusbx requires write access to USB "
+			usbi_err(ctx, "libusb requires write access to USB "
 				      "device nodes.");
 	}
 
@@ -1823,7 +1823,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer,
 			 * complications:
 			 *  - discarding is asynchronous - discarded urbs will be reaped
 			 *    later. the user must not have freed the transfer when the
-			 *    discarded URBs are reaped, otherwise libusbx will be using
+			 *    discarded URBs are reaped, otherwise libusb will be using
 			 *    freed memory.
 			 *  - the earlier URBs may have completed successfully and we do
 			 *    not want to throw away any data.
@@ -1985,7 +1985,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer)
 			 * complications:
 			 *  - discarding is asynchronous - discarded urbs will be reaped
 			 *    later. the user must not have freed the transfer when the
-			 *    discarded URBs are reaped, otherwise libusbx will be using
+			 *    discarded URBs are reaped, otherwise libusb will be using
 			 *    freed memory.
 			 *  - the earlier URBs may have completed successfully and we do
 			 *    not want to throw away any data.
@@ -2160,7 +2160,7 @@ static int handle_bulk_completion(struct usbi_transfer *itransfer,
 		 *
 		 * When this happens, our objectives are not to lose any "surplus" data,
 		 * and also to stick it at the end of the previously-received data
-		 * (closing any holes), so that libusbx reports the total amount of
+		 * (closing any holes), so that libusb reports the total amount of
 		 * transferred data and presents it in a contiguous chunk.
 		 */
 		if (urb->actual_length > 0) {
diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
index 1da9e1e..d43eea3 100644
--- a/libusb/os/netbsd_usb.c
+++ b/libusb/os/netbsd_usb.c
@@ -639,7 +639,7 @@ _sync_control_transfer(struct usbi_transfer *itransfer)
 
 	req.ucr_request.bmRequestType = setup->bmRequestType;
 	req.ucr_request.bRequest = setup->bRequest;
-	/* Don't use USETW, libusbx already deals with the endianness */
+	/* Don't use USETW, libusb already deals with the endianness */
 	(*(uint16_t *)req.ucr_request.wValue) = setup->wValue;
 	(*(uint16_t *)req.ucr_request.wIndex) = setup->wIndex;
 	(*(uint16_t *)req.ucr_request.wLength) = setup->wLength;
diff --git a/libusb/os/openbsd_usb.c b/libusb/os/openbsd_usb.c
index 01934ef..ef0b27b 100644
--- a/libusb/os/openbsd_usb.c
+++ b/libusb/os/openbsd_usb.c
@@ -700,7 +700,7 @@ _sync_control_transfer(struct usbi_transfer *itransfer)
 	req.ucr_addr = transfer->dev_handle->dev->device_address;
 	req.ucr_request.bmRequestType = setup->bmRequestType;
 	req.ucr_request.bRequest = setup->bRequest;
-	/* Don't use USETW, libusbx already deals with the endianness */
+	/* Don't use USETW, libusb already deals with the endianness */
 	(*(uint16_t *)req.ucr_request.wValue) = setup->wValue;
 	(*(uint16_t *)req.ucr_request.wIndex) = setup->wIndex;
 	(*(uint16_t *)req.ucr_request.wLength) = setup->wLength;
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c
index abe8761..2a75c5e 100644
--- a/libusb/os/poll_windows.c
+++ b/libusb/os/poll_windows.c
@@ -22,7 +22,7 @@
  */
 
 /*
- * poll() and pipe() Windows compatibility layer for libusbx 1.0
+ * poll() and pipe() Windows compatibility layer for libusb 1.0
  *
  * The way this layer works is by using OVERLAPPED with async I/O transfers, as
  * OVERLAPPED have an associated event which is flagged for I/O completion.
@@ -252,7 +252,7 @@ void exit_polling(void)
 
 /*
  * Create a fake pipe.
- * As libusbx only uses pipes for signaling, all we need from a pipe is an
+ * As libusb only uses pipes for signaling, all we need from a pipe is an
  * event. To that extent, we create a single wfd and overlapped as a means
  * to access that event.
  */
diff --git a/libusb/os/threads_posix.c b/libusb/os/threads_posix.c
index edf7063..95c1027 100644
--- a/libusb/os/threads_posix.c
+++ b/libusb/os/threads_posix.c
@@ -1,5 +1,5 @@
 /*
- * libusbx synchronization using POSIX Threads
+ * libusb synchronization using POSIX Threads
  *
  * Copyright © 2011 Vitali Lovich <vlovich@aliph.com>
  * Copyright © 2011 Peter Stuge <peter@stuge.se>
diff --git a/libusb/os/threads_posix.h b/libusb/os/threads_posix.h
index 0b6a71a..d7a5d21 100644
--- a/libusb/os/threads_posix.h
+++ b/libusb/os/threads_posix.h
@@ -1,5 +1,5 @@
 /*
- * libusbx synchronization using POSIX Threads
+ * libusb synchronization using POSIX Threads
  *
  * Copyright © 2010 Peter Stuge <peter@stuge.se>
  *
diff --git a/libusb/os/threads_windows.c b/libusb/os/threads_windows.c
index cad27e9..ac12738 100644
--- a/libusb/os/threads_windows.c
+++ b/libusb/os/threads_windows.c
@@ -1,5 +1,5 @@
 /*
- * libusbx synchronization on Microsoft Windows
+ * libusb synchronization on Microsoft Windows
  *
  * Copyright © 2010 Michael Plante <michael.plante@gmail.com>
  *
diff --git a/libusb/os/threads_windows.h b/libusb/os/threads_windows.h
index df8a0ee..2b82925 100644
--- a/libusb/os/threads_windows.h
+++ b/libusb/os/threads_windows.h
@@ -1,5 +1,5 @@
 /*
- * libusbx synchronization on Microsoft Windows
+ * libusb synchronization on Microsoft Windows
  *
  * Copyright © 2010 Michael Plante <michael.plante@gmail.com>
  *
diff --git a/libusb/os/wince_usb.c b/libusb/os/wince_usb.c
index c7ab7f6..c48d27d 100644
--- a/libusb/os/wince_usb.c
+++ b/libusb/os/wince_usb.c
@@ -1,5 +1,5 @@
 /*
- * Windows CE backend for libusbx 1.0
+ * Windows CE backend for libusb 1.0
  * Copyright © 2011-2013 RealVNC Ltd.
  * Large portions taken from Windows backend, which is
  * Copyright © 2009-2010 Pete Batard <pbatard@gmail.com>
diff --git a/libusb/os/wince_usb.h b/libusb/os/wince_usb.h
index 3db9693..bc61b5c 100644
--- a/libusb/os/wince_usb.h
+++ b/libusb/os/wince_usb.h
@@ -1,5 +1,5 @@
 /*
- * Windows CE backend for libusbx 1.0
+ * Windows CE backend for libusb 1.0
  * Copyright © 2011-2013 RealVNC Ltd.
  * Portions taken from Windows backend, which is
  * Copyright © 2009-2010 Pete Batard <pbatard@gmail.com>
@@ -36,7 +36,7 @@
 // This backend dynamically loads ceusbkwrapper.dll and doesn't include
 // ceusbkwrapper.h directly to simplify the build process. The kernel
 // side wrapper driver is built using the platform image build tools,
-// which makes it difficult to reference directly from the libusbx build
+// which makes it difficult to reference directly from the libusb build
 // system.
 struct UKW_DEVICE_PRIV;
 typedef struct UKW_DEVICE_PRIV *UKW_DEVICE;
diff --git a/libusb/os/windows_common.h b/libusb/os/windows_common.h
index 1da72bd..fe95d79 100644
--- a/libusb/os/windows_common.h
+++ b/libusb/os/windows_common.h
@@ -1,5 +1,5 @@
 /*
- * Windows backend common header for libusbx 1.0
+ * Windows backend common header for libusb 1.0
  *
  * This file brings together header code common between
  * the desktop Windows and Windows CE backends.
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 5abadc1..f0dd810 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -1,5 +1,5 @@
 /*
- * windows backend for libusbx 1.0
+ * windows backend for libusb 1.0
  * Copyright © 2009-2012 Pete Batard <pete@akeo.ie>
  * With contributions from Michael Plante, Orin Eman et al.
  * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
@@ -805,10 +805,10 @@ static void auto_release(struct usbi_transfer *itransfer)
 }
 
 /*
- * init: libusbx backend init function
+ * init: libusb backend init function
  *
  * This function enumerates the HCDs (Host Controller Drivers) and populates our private HCD list
- * In our implementation, we equate Windows' "HCD" to libusbx's "bus". Note that bus is zero indexed.
+ * In our implementation, we equate Windows' "HCD" to libusb's "bus". Note that bus is zero indexed.
  * HCDs are not expected to change after init (might not hold true for hot pluggable USB PCI card?)
  */
 static int windows_init(struct libusb_context *ctx)
@@ -1085,7 +1085,7 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle
 }
 
 /*
- * Populate a libusbx device structure
+ * Populate a libusb device structure
  */
 static int init_device(struct libusb_device* dev, struct libusb_device* parent_dev,
 					   uint8_t port_number, char* device_id, DWORD devinst)
@@ -1339,7 +1339,7 @@ static int set_hid_interface(struct libusb_context* ctx, struct libusb_device* d
 }
 
 /*
- * get_device_list: libusbx backend device enumeration function
+ * get_device_list: libusb backend device enumeration function
  */
 static int windows_get_device_list(struct libusb_context *ctx, struct discovered_devs **_discdevs)
 {
@@ -1489,7 +1489,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered
 				if (!pSetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_DRIVER,
 					&reg_type, (BYTE*)strbuf, size, &size)) {
 						usbi_info(ctx, "The following device has no driver: '%s'", dev_id_path);
-						usbi_info(ctx, "libusbx will not be able to access it.");
+						usbi_info(ctx, "libusb will not be able to access it.");
 				}
 				// ...and to add the additional device interface GUIDs
 				key = pSetupDiOpenDevRegKey(dev_info, &dev_info_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ);
@@ -1696,7 +1696,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered
 }
 
 /*
- * exit: libusbx backend deinitialization function
+ * exit: libusb backend deinitialization function
  */
 static void windows_exit(void)
 {
@@ -4317,7 +4317,7 @@ static int composite_submit_control_transfer(int sub_api, struct usbi_transfer *
 		}
 	}
 
-	usbi_err(ctx, "no libusbx supported interfaces to complete request");
+	usbi_err(ctx, "no libusb supported interfaces to complete request");
 	return LIBUSB_ERROR_NOT_FOUND;
 }
 
diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h
index 5d67a56..4e8aac0 100644
--- a/libusb/os/windows_usb.h
+++ b/libusb/os/windows_usb.h
@@ -1,5 +1,5 @@
 /*
- * Windows backend for libusbx 1.0
+ * Windows backend for libusb 1.0
  * Copyright © 2009-2012 Pete Batard <pete@akeo.ie>
  * With contributions from Michael Plante, Orin Eman et al.
  * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
diff --git a/libusb/strerror.c b/libusb/strerror.c
index 0212df8..3af1cab 100644
--- a/libusb/strerror.c
+++ b/libusb/strerror.c
@@ -35,7 +35,7 @@ static size_t usbi_locale = 0;
  * How to add a new \ref libusb_strerror() translation:
  * <ol>
  * <li> Download the latest \c strerror.c from:<br>
- *      https://raw.github.com/libusbx/libusbx/master/libusb/sterror.c </li>
+ *      https://raw.github.com/libusb/libusb/master/libusb/sterror.c </li>
  * <li> Open the file in an UTF-8 capable editor </li>
  * <li> Add the 2 letter <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">ISO 639-1</a>
  *      code for your locale at the end of \c usbi_locale_supported[]<br>
@@ -53,7 +53,7 @@ static size_t usbi_locale = 0;
  *     }
  * };\endcode </li>
  * <li> Translate each of the English messages from the section you copied into your language </li>
- * <li> Save the file (in UTF-8 format) and send it to \c libusbx-devel\@lists.sourceforge.net </li>
+ * <li> Save the file (in UTF-8 format) and send it to \c libusb-devel\@lists.sourceforge.net </li>
  * </ol>
  */
 
diff --git a/libusb/sync.c b/libusb/sync.c
index 42e486d..d87032d 100644
--- a/libusb/sync.c
+++ b/libusb/sync.c
@@ -1,5 +1,5 @@
 /*
- * Synchronous I/O functions for libusbx
+ * Synchronous I/O functions for libusb
  * Copyright © 2007-2008 Daniel Drake <dsd@gentoo.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
 /**
  * @defgroup syncio Synchronous device I/O
  *
- * This page documents libusbx's synchronous (blocking) API for USB device I/O.
+ * This page documents libusb's synchronous (blocking) API for USB device I/O.
  * This interface is easy to use but has some limitations. More advanced users
  * may wish to consider using the \ref asyncio "asynchronous I/O API" instead.
  */
@@ -222,9 +222,9 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
  * Not all of the data may have been written.
  *
  * Also check <tt>transferred</tt> when dealing with a timeout error code.
- * libusbx may have to split your transfer into a number of chunks to satisfy
+ * libusb may have to split your transfer into a number of chunks to satisfy
  * underlying O/S requirements, meaning that the timeout may expire after
- * the first few chunks have completed. libusbx is careful not to lose any data
+ * the first few chunks have completed. libusb is careful not to lose any data
  * that may have been transferred; do not assume that timeout conditions
  * indicate a complete lack of I/O.
  *
@@ -270,9 +270,9 @@ int API_EXPORTED libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
  * writes. Not all of the data may have been written.
  *
  * Also check <tt>transferred</tt> when dealing with a timeout error code.
- * libusbx may have to split your transfer into a number of chunks to satisfy
+ * libusb may have to split your transfer into a number of chunks to satisfy
  * underlying O/S requirements, meaning that the timeout may expire after
- * the first few chunks have completed. libusbx is careful not to lose any data
+ * the first few chunks have completed. libusb is careful not to lose any data
  * that may have been transferred; do not assume that timeout conditions
  * indicate a complete lack of I/O.
  *
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 9b72a0c..d576271 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10857
+#define LIBUSB_NANO 10858
diff --git a/msvc/libusbx.dsw b/msvc/libusb.dsw
index 14569a6..14569a6 100644
--- a/msvc/libusbx.dsw
+++ b/msvc/libusb.dsw
diff --git a/msvc/libusbx_2005.sln b/msvc/libusb_2005.sln
index f014186..f014186 100644
--- a/msvc/libusbx_2005.sln
+++ b/msvc/libusb_2005.sln
diff --git a/msvc/libusbx_2010.sln b/msvc/libusb_2010.sln
index 257eee0..257eee0 100644
--- a/msvc/libusbx_2010.sln
+++ b/msvc/libusb_2010.sln
diff --git a/msvc/libusbx_2012.sln b/msvc/libusb_2012.sln
index c5c5800..c5c5800 100644
--- a/msvc/libusbx_2012.sln
+++ b/msvc/libusb_2012.sln
diff --git a/msvc/libusbx_2013.sln b/msvc/libusb_2013.sln
index 9d04d2c..9d04d2c 100644
--- a/msvc/libusbx_2013.sln
+++ b/msvc/libusb_2013.sln
diff --git a/msvc/libusbx_wince.sln b/msvc/libusb_wince.sln
index a0d1758..a0d1758 100644
--- a/msvc/libusbx_wince.sln
+++ b/msvc/libusb_wince.sln
diff --git a/msvc/stress_2005.vcproj b/msvc/stress_2005.vcproj
index 9cc6dba..ebb5491 100644
--- a/msvc/stress_2005.vcproj
+++ b/msvc/stress_2005.vcproj
@@ -380,7 +380,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\tests\libusbx_testlib.h"
+				RelativePath="..\tests\libusb_testlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/msvc/stress_2010.vcxproj b/msvc/stress_2010.vcxproj
index 511da0a..f974796 100644
--- a/msvc/stress_2010.vcxproj
+++ b/msvc/stress_2010.vcxproj
@@ -159,7 +159,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\libusbx_testlib.h" />
+    <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc/stress_2010.vcxproj.filters b/msvc/stress_2010.vcxproj.filters
index 1e792f7..bbe84b8 100644
--- a/msvc/stress_2010.vcxproj.filters
+++ b/msvc/stress_2010.vcxproj.filters
@@ -18,7 +18,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\libusbx_testlib.h">
+    <ClInclude Include="..\tests\libusb_testlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/msvc/stress_2012.vcxproj b/msvc/stress_2012.vcxproj
index 4d5659a..94ca149 100644
--- a/msvc/stress_2012.vcxproj
+++ b/msvc/stress_2012.vcxproj
@@ -163,7 +163,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\libusbx_testlib.h" />
+    <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc/stress_2012.vcxproj.filters b/msvc/stress_2012.vcxproj.filters
index 1e792f7..bbe84b8 100644
--- a/msvc/stress_2012.vcxproj.filters
+++ b/msvc/stress_2012.vcxproj.filters
@@ -18,7 +18,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\libusbx_testlib.h">
+    <ClInclude Include="..\tests\libusb_testlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/msvc/stress_2013.vcxproj b/msvc/stress_2013.vcxproj
index 5571b9d..da70339 100644
--- a/msvc/stress_2013.vcxproj
+++ b/msvc/stress_2013.vcxproj
@@ -163,7 +163,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\libusbx_testlib.h" />
+    <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc/stress_wince.vcproj b/msvc/stress_wince.vcproj
index 0f79535..86b0388 100644
--- a/msvc/stress_wince.vcproj
+++ b/msvc/stress_wince.vcproj
@@ -1112,7 +1112,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\tests\libusbx_testlib.h"
+				RelativePath="..\tests\libusb_testlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bf53f3f..12c5105 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,4 +3,4 @@ LDADD = ../libusb/libusb-1.0.la
 
 noinst_PROGRAMS = stress
 
-stress_SOURCES = stress.c libusbx_testlib.h testlib.c
+stress_SOURCES = stress.c libusb_testlib.h testlib.c
diff --git a/tests/libusbx_testlib.h b/tests/libusb_testlib.h
index 06dbc8e..6c987d3 100644
--- a/tests/libusbx_testlib.h
+++ b/tests/libusb_testlib.h
@@ -1,5 +1,5 @@
 /*
- * libusbx test library helper functions
+ * libusb test library helper functions
  * Copyright © 2012 Toby Gray <toby.gray@realvnc.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBUSBX_TESTLIB_H
-#define LIBUSBX_TESTLIB_H
+#ifndef LIBUSB_TESTLIB_H
+#define LIBUSB_TESTLIB_H
 
 #include <stdio.h>
 
@@ -43,7 +43,7 @@ typedef enum {
 	/** Indicates that the test can't be run. For example this may be
 	* due to no suitable device being connected to perform the tests.*/
 	TEST_STATUS_SKIP
-} libusbx_testlib_result;
+} libusb_testlib_result;
 
 /**
  * Context for test library functions
@@ -57,21 +57,21 @@ typedef struct {
 	int old_stderr;
 	FILE* output_file;
 	int null_fd;
-} libusbx_testlib_ctx;
+} libusb_testlib_ctx;
 
 /**
  * Logs some test information or state
  */
-void libusbx_testlib_logf(libusbx_testlib_ctx * ctx, 
+void libusb_testlib_logf(libusb_testlib_ctx * ctx, 
                           const char* fmt, ...);
 
 /**
- * Function pointer for a libusbx test function.
+ * Function pointer for a libusb test function.
  *
  * Should return TEST_STATUS_SUCCESS on success or another TEST_STATUS value.
  */
-typedef libusbx_testlib_result
-(*libusbx_testlib_test_function)(libusbx_testlib_ctx * ctx);
+typedef libusb_testlib_result
+(*libusb_testlib_test_function)(libusb_testlib_ctx * ctx);
 
 /**
  * Structure holding a test description.
@@ -80,14 +80,14 @@ typedef struct {
 	/** Human readable name of the test. */
 	const char * name;
 	/** The test library will call this function to run the test. */
-	libusbx_testlib_test_function function;
-} libusbx_testlib_test;
+	libusb_testlib_test_function function;
+} libusb_testlib_test;
 
 /**
  * Value to use at the end of a test array to indicate the last
  * element.
  */
-#define LIBUSBX_NULL_TEST {NULL, NULL}
+#define LIBUSB_NULL_TEST {NULL, NULL}
 
 /**
  * Runs the tests provided.
@@ -100,8 +100,8 @@ typedef struct {
  * \param tests A NULL_TEST terminated array of tests
  * \return 0 on success, non-zero on failure
  */
-int libusbx_testlib_run_tests(int argc,
+int libusb_testlib_run_tests(int argc,
                               char ** argv,
-                              const libusbx_testlib_test * tests);
+                              const libusb_testlib_test * tests);
 
-#endif //LIBUSBX_TESTLIB_H
+#endif //LIBUSB_TESTLIB_H
diff --git a/tests/stress.c b/tests/stress.c
index db8d233..0f50003 100644
--- a/tests/stress.c
+++ b/tests/stress.c
@@ -1,5 +1,5 @@
 /*
- * libusbx stress test program to perform simple stress tests
+ * libusb stress test program to perform simple stress tests
  * Copyright © 2012 Toby Gray <toby.gray@realvnc.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -22,18 +22,18 @@
 #include <memory.h>
 
 #include "libusb.h"
-#include "libusbx_testlib.h"
+#include "libusb_testlib.h"
 
 /** Test that creates and destroys a single concurrent context
  * 10000 times. */
-static libusbx_testlib_result test_init_and_exit(libusbx_testlib_ctx * tctx)
+static libusb_testlib_result test_init_and_exit(libusb_testlib_ctx * tctx)
 {
 	libusb_context * ctx = NULL;
 	int i;
 	for (i = 0; i < 10000; ++i) {
 		int r = libusb_init(&ctx);
 		if (r != LIBUSB_SUCCESS) {
-			libusbx_testlib_logf(tctx,
+			libusb_testlib_logf(tctx,
 				"Failed to init libusb on iteration %d: %d",
 				i, r);
 			return TEST_STATUS_FAILURE;
@@ -46,20 +46,20 @@ static libusbx_testlib_result test_init_and_exit(libusbx_testlib_ctx * tctx)
 }
 
 /** Tests that devices can be listed 1000 times. */
-static libusbx_testlib_result test_get_device_list(libusbx_testlib_ctx * tctx)
+static libusb_testlib_result test_get_device_list(libusb_testlib_ctx * tctx)
 {
 	libusb_context * ctx = NULL;
 	int r, i;
 	r = libusb_init(&ctx);
 	if (r != LIBUSB_SUCCESS) {
-		libusbx_testlib_logf(tctx, "Failed to init libusb: %d", r);
+		libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
 		return TEST_STATUS_FAILURE;
 	}
 	for (i = 0; i < 1000; ++i) {
 		libusb_device ** device_list;
 		ssize_t list_size = libusb_get_device_list(ctx, &device_list);
 		if (list_size < 0 || device_list == NULL) {
-			libusbx_testlib_logf(tctx,
+			libusb_testlib_logf(tctx,
 				"Failed to get device list on iteration %d: %d (%p)",
 				i, -list_size, device_list);
 			return TEST_STATUS_FAILURE;
@@ -71,7 +71,7 @@ static libusbx_testlib_result test_get_device_list(libusbx_testlib_ctx * tctx)
 }
 
 /** Tests that 100 concurrent device lists can be open at a time. */
-static libusbx_testlib_result test_many_device_lists(libusbx_testlib_ctx * tctx)
+static libusb_testlib_result test_many_device_lists(libusb_testlib_ctx * tctx)
 {
 #define LIST_COUNT 100
 	libusb_context * ctx = NULL;
@@ -81,7 +81,7 @@ static libusbx_testlib_result test_many_device_lists(libusbx_testlib_ctx * tctx)
 
 	r = libusb_init(&ctx);
 	if (r != LIBUSB_SUCCESS) {
-		libusbx_testlib_logf(tctx, "Failed to init libusb: %d", r);
+		libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
 		return TEST_STATUS_FAILURE;
 	}
 
@@ -89,7 +89,7 @@ static libusbx_testlib_result test_many_device_lists(libusbx_testlib_ctx * tctx)
 	for (i = 0; i < LIST_COUNT; ++i) {
 		ssize_t list_size = libusb_get_device_list(ctx, &(device_lists[i]));
 		if (list_size < 0 || device_lists[i] == NULL) {
-			libusbx_testlib_logf(tctx,
+			libusb_testlib_logf(tctx,
 				"Failed to get device list on iteration %d: %d (%p)",
 				i, -list_size, device_lists[i]);
 			return TEST_STATUS_FAILURE;
@@ -112,7 +112,7 @@ static libusbx_testlib_result test_many_device_lists(libusbx_testlib_ctx * tctx)
 /** Tests that the default context (used for various things including
  * logging) works correctly when the first context created in a
  * process is destroyed. */
-static libusbx_testlib_result test_default_context_change(libusbx_testlib_ctx * tctx)
+static libusb_testlib_result test_default_context_change(libusb_testlib_ctx * tctx)
 {
 	libusb_context * ctx = NULL;
 	int r, i;
@@ -121,7 +121,7 @@ static libusbx_testlib_result test_default_context_change(libusbx_testlib_ctx *
 		/* First create a new context */
 		r = libusb_init(&ctx);
 		if (r != LIBUSB_SUCCESS) {
-			libusbx_testlib_logf(tctx, "Failed to init libusb: %d", r);
+			libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
 			return TEST_STATUS_FAILURE;
 		}
 
@@ -132,7 +132,7 @@ static libusbx_testlib_result test_default_context_change(libusbx_testlib_ctx *
 		/* Now create a reference to the default context */
 		r = libusb_init(NULL);
 		if (r != LIBUSB_SUCCESS) {
-			libusbx_testlib_logf(tctx, "Failed to init libusb: %d", r);
+			libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
 			return TEST_STATUS_FAILURE;
 		}
 
@@ -146,15 +146,15 @@ static libusbx_testlib_result test_default_context_change(libusbx_testlib_ctx *
 }
 
 /* Fill in the list of tests. */
-static const libusbx_testlib_test tests[] = {
+static const libusb_testlib_test tests[] = {
 	{"init_and_exit", &test_init_and_exit},
 	{"get_device_list", &test_get_device_list},
 	{"many_device_lists", &test_many_device_lists},
 	{"default_context_change", &test_default_context_change},
-	LIBUSBX_NULL_TEST
+	LIBUSB_NULL_TEST
 };
 
 int main (int argc, char ** argv)
 {
-	return libusbx_testlib_run_tests(argc, argv, tests);
+	return libusb_testlib_run_tests(argc, argv, tests);
 }
diff --git a/tests/testlib.c b/tests/testlib.c
index 7cab0b9..aa38cf1 100644
--- a/tests/testlib.c
+++ b/tests/testlib.c
@@ -1,5 +1,5 @@
 /*
- * libusbx test library helper functions
+ * libusb test library helper functions
  * Copyright © 2012 Toby Gray <toby.gray@realvnc.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libusbx_testlib.h"
+#include "libusb_testlib.h"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -53,7 +53,7 @@
 /**
  * Converts a test result code into a human readable string.
  */
-static const char* test_result_to_str(libusbx_testlib_result result)
+static const char* test_result_to_str(libusb_testlib_result result)
 {
 	switch (result) {
 	case TEST_STATUS_SUCCESS:
@@ -77,7 +77,7 @@ static void print_usage(int argc, char ** argv)
 	printf("   -v   Don't redirect STDERR/STDOUT during tests\n");
 }
 
-static void cleanup_test_output(libusbx_testlib_ctx * ctx)
+static void cleanup_test_output(libusb_testlib_ctx * ctx)
 {
 #ifndef DISABLE_STDOUT_REDIRECTION
 	if (!ctx->verbose) {
@@ -105,7 +105,7 @@ static void cleanup_test_output(libusbx_testlib_ctx * ctx)
  * Setup test output handles
  * \return zero on success, non-zero on failure
  */
-static int setup_test_output(libusbx_testlib_ctx * ctx)
+static int setup_test_output(libusb_testlib_ctx * ctx)
 {
 #ifndef DISABLE_STDOUT_REDIRECTION
 	/* Stop output to stdout and stderr from being displayed if using non-verbose output */
@@ -149,7 +149,7 @@ static int setup_test_output(libusbx_testlib_ctx * ctx)
 	return 0;
 }
 
-void libusbx_testlib_logf(libusbx_testlib_ctx * ctx,
+void libusb_testlib_logf(libusb_testlib_ctx * ctx,
 	const char* fmt, ...)
 {
 	va_list va;
@@ -160,9 +160,9 @@ void libusbx_testlib_logf(libusbx_testlib_ctx * ctx,
 	fflush(ctx->output_file);
 }
 
-int libusbx_testlib_run_tests(int argc,
+int libusb_testlib_run_tests(int argc,
 	char ** argv,
-	const libusbx_testlib_test * tests)
+	const libusb_testlib_test * tests)
 {
 	int run_count = 0;
 	int idx = 0;
@@ -172,8 +172,8 @@ int libusbx_testlib_run_tests(int argc,
 	int skip_count = 0;
 	int r, j;
 	size_t arglen;
-	libusbx_testlib_result test_result;
-	libusbx_testlib_ctx ctx;
+	libusb_testlib_result test_result;
+	libusb_testlib_ctx ctx;
 
 	/* Setup default mode of operation */
 	ctx.test_names = NULL;
@@ -227,7 +227,7 @@ int libusbx_testlib_run_tests(int argc,
 	/* Act on any options not related to running tests */
 	if (ctx.list_tests) {
 		while (tests[idx].function != NULL) {
-			libusbx_testlib_logf(&ctx, tests[idx].name);
+			libusb_testlib_logf(&ctx, tests[idx].name);
 			++idx;
 		}
 		cleanup_test_output(&ctx);
@@ -236,7 +236,7 @@ int libusbx_testlib_run_tests(int argc,
 
 	/* Run any requested tests */
 	while (tests[idx].function != NULL) {
-		const libusbx_testlib_test * test = &tests[idx];
+		const libusb_testlib_test * test = &tests[idx];
 		++idx;
 		if (ctx.test_count > 0) {
 			/* Filtering tests to run, check if this is one of them */
@@ -251,10 +251,10 @@ int libusbx_testlib_run_tests(int argc,
 				continue;
 			}
 		}
-		libusbx_testlib_logf(&ctx,
+		libusb_testlib_logf(&ctx,
 			"Starting test run: %s...", test->name);
 		test_result = test->function(&ctx);
-		libusbx_testlib_logf(&ctx,
+		libusb_testlib_logf(&ctx,
 			"%s (%d)",
 			test_result_to_str(test_result), test_result);
 		switch (test_result) {
@@ -265,12 +265,12 @@ int libusbx_testlib_run_tests(int argc,
 		}
 		++run_count;
 	}
-	libusbx_testlib_logf(&ctx, "---");
-	libusbx_testlib_logf(&ctx, "Ran %d tests", run_count);
-	libusbx_testlib_logf(&ctx, "Passed %d tests", pass_count);
-	libusbx_testlib_logf(&ctx, "Failed %d tests", fail_count);
-	libusbx_testlib_logf(&ctx, "Error in %d tests", error_count);
-	libusbx_testlib_logf(&ctx, "Skipped %d tests", skip_count);
+	libusb_testlib_logf(&ctx, "---");
+	libusb_testlib_logf(&ctx, "Ran %d tests", run_count);
+	libusb_testlib_logf(&ctx, "Passed %d tests", pass_count);
+	libusb_testlib_logf(&ctx, "Failed %d tests", fail_count);
+	libusb_testlib_logf(&ctx, "Error in %d tests", error_count);
+	libusb_testlib_logf(&ctx, "Skipped %d tests", skip_count);
 
 	cleanup_test_output(&ctx);
 	return pass_count != run_count;
author	hjelmn <Nathan Hjelm hjelmn@cs.unm.edu>	2013-12-11 23:52:34 +0000
committer	Pete Batard <pete@akeo.ie>	2013-12-30 21:58:07 +0000
commit	8cb3cb34fb7dca5d7586c68a61f2761a2e103195 (patch)
tree	6a244d89d3b7b8c4c4d2accb7822acb9450eb2ba
parent	8b46e1c088167eb86b1712765896e2f17d70d148 (diff)
download	libusb-mergeback.tar.gz