libusbx 1.0.13-rc1

diff --git a/AUTHORS b/AUTHORS
index 9ff64d6..a2f5558 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,12 +10,14 @@ Other contributors:
 Alan Ott
 Alan Stern
 Alex Vatchenko
+Anthony Clay
 Artem Egorkine
 Aurelien Jarno
 Bastien Nocera
 Dave Camarillo
 David Engraf
 David Moore
+Davidlohr Bueso
 Felipe Balbi
 Francesco Montorsi
 Graeme Gill
@@ -27,13 +29,17 @@ Konrad Rzepecki
 Lars Wirzenius
 Ludovic Rousseau
 Martin Koegler
+Matthias Bolte
 Mike Frysinger
 Mikhail Gusarov
+Nicholas Corgan
+Orin Eman
 Pekka Nikander
 Peter Stuge
 Rob Walker
 Sean McBride
 Sebastian Pipping
+Simon Haggett
 Thomas Röfer
 Toby Gray
 Toby Peterson

diff --git a/NEWS b/NEWS
index 16fe072..f86aac9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,25 @@ This file lists notable changes in each release.
 For fine grained history, please see the git log at:
 http://log.libusbx.org
 
+2012-09-16: v1.0.13-rc1
+* [MAJOR] Fix a typo in the API with struct libusb_config_descriptor where
+  MaxPower was used instead of bMaxPower, as defined in the specs. If your 
+  application was accessing the MaxPower attribute, and you need to maintain
+  compatibility with libusb or older versions, see APPENDIX A below.
+* 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
+* Add Cypress FX/FX2 firmware upload sample, based fxload from
+  http://linux-hotplug.sourceforge.net
+* Add libusb0 (libusb-win32) and libusbK driver support on Windows. Note that using
+  the libusb-win32 filter driver with composite member devices is not supported yet
+* Add support for the new get_capabilities ioctl on Linux and avoid unnecessary
+  splitting of bulk transfers
+* Improve support for newer Intel and Renesas USB 3.0 controllers on Windows
+* Harmonize the device number for root hubs accross platforms
+* Other bug fixes and improvements
+
 2012-06-15: v1.0.12
 * Fix a potential major regression with pthread on Linux
 * Fix missing thread ID from debug log output on cygwin
@@ -91,3 +110,23 @@ http://log.libusbx.org
 
 2008-05-25: v0.9.0 release
  * First libusb-1.0 beta release
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+APPENDIX A - How to maintain code compatibility with versions of libusb and
+libusbx 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.
+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 (dev->config[0].bMaxPower < 250)
+#else
+  if (dev->config[0].MaxPower < 250)
+#endif

diff --git a/README b/README
index 3bf0e48..3add731 100644 (file)
--- a/README
+++ b/README
@@ -2,10 +2,11 @@ libusbx
 =======
 
 libusbx is a library for USB device access from Linux, Mac OS X,
-Windows and OpenBSD userspace (with OpenBSD, and to a lesser extent
-Windows, currently being considered EXPERIMENTAL).
+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.
 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).
+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
 be ported to other operating systems. Please see the PORTING file

diff --git a/README.git b/README.git
index 2cbf546..6d7db42 100644 (file)
--- a/README.git
+++ b/README.git
@@ -18,7 +18,7 @@ Notes related to submitting new developments:
 If you submit a new development to libusbx (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
-libsubx repository under this account from https://github.com/libusbx/libusbx.
+libusbx repository under this account from https://github.com/libusbx/libusbx.
 
 Then you can create a git branch for your work, that we will be able to better
 reference and test. 

diff --git a/libusb/version.h b/libusb/version.h
index 98a7ea8..56f1b15 100644 (file)
--- a/libusb/version.h
+++ b/libusb/version.h
@@ -7,12 +7,12 @@
 #define LIBUSB_MINOR 0
 #endif
 #ifndef LIBUSB_MICRO
-#define LIBUSB_MICRO 12
+#define LIBUSB_MICRO 13
 #endif
 #ifndef LIBUSB_NANO
 #define LIBUSB_NANO 0
 #endif
 /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */
 #ifndef LIBUSB_RC
-#define LIBUSB_RC ""
+#define LIBUSB_RC "-rc1"
 #endif

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index b4791e4..955892f 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10568
+#define LIBUSB_NANO 10569