OK, since I'd like to use the 1.1 version change as an opportunity to
slide in a couple more API changes (set transfer codes to negative, as
well as #21, and possibly libusb_strerror), but I doubt people will want
to wait a week or so, we might as well try to go with a 1.0.14 that
reverts bMaxPower.
This will occur without RC, and, unless somebody else but me wants to
take on themselves to maintain a 1.0.x branch, may be the very last
release of the 1.0 branch.
Unless there are objections, expect that to occur in about 22 hours or so.
I have updated the milestones accordingly.
Regards,
/Pete
>From 8449481e58e5b947b79b9eb8e25c4f9c2121ebbc Mon Sep 17 00:00:00 2001
From: Pete Batard <p...@akeo.ie>
Date: Tue, 25 Sep 2012 00:35:32 +0100
Subject: [PATCH] libusbx-1.0.14
---
NEWS | 10 ++++++++--
libusb/libusb.h | 4 ++--
libusb/version.h | 2 +-
libusb/version_nano.h | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index ed25d5f..99d6b54 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ This file lists notable changes in each release.
For fine grained history, please see the git log at:
http://log.libusbx.org
+2012-09-26: v1.0.14
+* 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 v1.1, to be released soon.
+* Note that LIBUSBX_API_VERSION is *decreased* to 0x010000FF
+
2012-09-20: v1.0.13
* [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
@@ -11,7 +17,7 @@ http://log.libusbx.org
* 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
+* 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
@@ -19,7 +25,7 @@ http://log.libusbx.org
* 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
+* Harmonize the device number for root hubs across platforms
* Other bug fixes and improvements
2012-06-15: v1.0.12
diff --git a/libusb/libusb.h b/libusb/libusb.h
index 7972ef9..da94c9b 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -130,7 +130,7 @@ typedef unsigned __int32 uint32_t;
* Internally, LIBUSBX_API_VERSION is defined as follows:
* (libusbx major << 24) | (libusbx minor << 16) | (16 bit incremental)
*/
-#define LIBUSBX_API_VERSION 0x01000100
+#define LIBUSBX_API_VERSION 0x010000FF
#ifdef __cplusplus
extern "C" {
@@ -627,7 +627,7 @@ struct libusb_config_descriptor {
/** Maximum power consumption of the USB device from this bus in this
* configuration when the device is fully opreation. Expressed in units
* of 2 mA. */
- uint8_t bMaxPower;
+ uint8_t MaxPower;
/** Array of interfaces supported by this configuration. The length of
* this array is determined by the bNumInterfaces field. */
diff --git a/libusb/version.h b/libusb/version.h
index dbc8acf..1970a01 100644
--- a/libusb/version.h
+++ b/libusb/version.h
@@ -7,7 +7,7 @@
#define LIBUSB_MINOR 0
#endif
#ifndef LIBUSB_MICRO
-#define LIBUSB_MICRO 13
+#define LIBUSB_MICRO 14
#endif
#ifndef LIBUSB_NANO
#define LIBUSB_NANO 0
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 327d562..9c8b259 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10575
+#define LIBUSB_NANO 10576
--
1.7.11.msysgit.0
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
libusbx-devel mailing list
libusbx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libusbx-devel
