v2. To keep it short, besides a link to libusbx.org, I very much want to have a 2012 year mentioned in there, to show that we're actively updating the library. That's why I tried to combine the whole thing in the copyright line. So, from now on, you're gonna have my name there.

Regards,

/Pete
>From e06b48761b644be977f1d6c745f2ff0d93e72cc6 Mon Sep 17 00:00:00 2001
From: Pete Batard <p...@akeo.ie>
Date: Thu, 6 Sep 2012 00:47:08 +0100
Subject: [PATCH] Core: Update libusb.h header in accordance with USB 3.0
 specs

* Also update copyright notice
---
 libusb/libusb.h       | 26 +++++++++++++++++++-------
 libusb/version_nano.h |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/libusb/libusb.h b/libusb/libusb.h
index de31a56..ae00c53 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -1,7 +1,9 @@
 /*
  * Public libusbx header file
- * Copyright © 2007-2008 Daniel Drake <d...@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johan...@erdfelt.com>
+ * Copyright © 2007-2008 Daniel Drake <d...@gentoo.org>
+ * Copyright © 2012 Pete Batard <p...@akeo.ie>
+ * For more information, please visit: http://libusbx.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -231,6 +233,9 @@ enum libusb_descriptor_type {
 
        /** Hub descriptor */
        LIBUSB_DT_HUB = 0x29,
+
+       /** SuperSpeed Hub descriptor */
+       LIBUSB_DT_SUPERSPEED_HUB = 0x2A,
 };
 
 /* Descriptor sizes per descriptor type */
@@ -277,7 +282,7 @@ enum libusb_transfer_type {
 };
 
 /** \ingroup misc
- * Standard requests, as defined in table 9-3 of the USB2 specifications */
+ * Standard requests, as defined in table 9-5 of the USB 3.0 specifications */
 enum libusb_standard_request {
        /** Request status of the specific recipient */
        LIBUSB_REQUEST_GET_STATUS = 0x00,
@@ -315,6 +320,13 @@ enum libusb_standard_request {
 
        /** Set then report an endpoint's synchronization frame */
        LIBUSB_REQUEST_SYNCH_FRAME = 0x0C,
+
+       /** Sets both the U1 and U2 Exit Latency */
+       LIBUSB_REQUEST_SET_SEL = 0x30,
+
+       /** Delay from the time a host transmits a packet to the time it is
+         * received by the device. */
+       LIBUSB_SET_ISOCH_DELAY = 0x31,
 };
 
 /** \ingroup misc
@@ -394,7 +406,7 @@ enum libusb_iso_usage_type {
 
 /** \ingroup desc
  * A structure representing the standard USB device descriptor. This
- * descriptor is documented in section 9.6.1 of the USB 2.0 specification.
+ * descriptor is documented in section 9.6.1 of the USB 3.0 specification.
  * All multiple-byte fields are represented in host-endian format.
  */
 struct libusb_device_descriptor {
@@ -448,7 +460,7 @@ struct libusb_device_descriptor {
 
 /** \ingroup desc
  * A structure representing the standard USB endpoint descriptor. This
- * descriptor is documented in section 9.6.3 of the USB 2.0 specification.
+ * descriptor is documented in section 9.6.6 of the USB 3.0 specification.
  * All multiple-byte fields are represented in host-endian format.
  */
 struct libusb_endpoint_descriptor {
@@ -498,7 +510,7 @@ struct libusb_endpoint_descriptor {
 
 /** \ingroup desc
  * A structure representing the standard USB interface descriptor. This
- * descriptor is documented in section 9.6.5 of the USB 2.0 specification.
+ * descriptor is documented in section 9.6.5 of the USB 3.0 specification.
  * All multiple-byte fields are represented in host-endian format.
  */
 struct libusb_interface_descriptor {
@@ -560,7 +572,7 @@ struct libusb_interface {
 
 /** \ingroup desc
  * A structure representing the standard USB configuration descriptor. This
- * descriptor is documented in section 9.6.3 of the USB 2.0 specification.
+ * descriptor is documented in section 9.6.3 of the USB 3.0 specification.
  * All multiple-byte fields are represented in host-endian format.
  */
 struct libusb_config_descriptor {
@@ -590,7 +602,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  MaxPower;
+       uint8_t  bMaxPower;
 
        /** Array of interfaces supported by this configuration. The length of
         * this array is determined by the bNumInterfaces field. */
-- 
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

Reply via email to