aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2012-03-18 20:14:51 +1100
committerBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2012-03-18 20:14:51 +1100
commite40e701387c10663fc3f415e5f5189698c1782ab (patch)
tree013f6ec0ea4775956607a0bef272fa29485cff84
parentfbbed42c1e5719cc7a4dceeba098981f19f37c06 (diff)
downloadexternal_heimdall-e40e701387c10663fc3f415e5f5189698c1782ab.zip
external_heimdall-e40e701387c10663fc3f415e5f5189698c1782ab.tar.gz
external_heimdall-e40e701387c10663fc3f415e5f5189698c1782ab.tar.bz2
Updated libusb-1.0 binaries/headers for windows.
-rw-r--r--libusb-1.0/include/libusb.h47
-rw-r--r--libusb-1.0/lib/Win32/Debug/libusb-1.0.dllbin146432 -> 148480 bytes
-rw-r--r--libusb-1.0/lib/Win32/Debug/libusb-1.0.libbin158606 -> 161312 bytes
-rw-r--r--libusb-1.0/lib/Win32/Debug/libusb-1.0.pdbbin0 -> 453632 bytes
-rw-r--r--libusb-1.0/lib/Win32/Release/libusb-1.0.dllbin92672 -> 94208 bytes
-rw-r--r--libusb-1.0/lib/Win32/Release/libusb-1.0.libbin158606 -> 161312 bytes
6 files changed, 43 insertions, 4 deletions
diff --git a/libusb-1.0/include/libusb.h b/libusb-1.0/include/libusb.h
index d466109..a0ffab8 100644
--- a/libusb-1.0/include/libusb.h
+++ b/libusb-1.0/include/libusb.h
@@ -155,11 +155,15 @@ enum libusb_class_code {
/** Human Interface Device class */
LIBUSB_CLASS_HID = 3,
- /** Printer dclass */
+ /** Physical */
+ LIBUSB_CLASS_PHYSICAL = 5,
+
+ /** Printer class */
LIBUSB_CLASS_PRINTER = 7,
- /** Picture transfer protocol class */
- LIBUSB_CLASS_PTP = 6,
+ /** Image class */
+ LIBUSB_CLASS_PTP = 6, /* legacy name from libusb-0.1 usb.h */
+ LIBUSB_CLASS_IMAGE = 6,
/** Mass storage class */
LIBUSB_CLASS_MASS_STORAGE = 8,
@@ -170,6 +174,21 @@ enum libusb_class_code {
/** Data class */
LIBUSB_CLASS_DATA = 10,
+ /** Smart Card */
+ LIBUSB_CLASS_SMART_CARD = 0x0b,
+
+ /** Content Security */
+ LIBUSB_CLASS_CONTENT_SECURITY = 0x0d,
+
+ /** Video */
+ LIBUSB_CLASS_VIDEO = 0x0e,
+
+ /** Personal Healthcare */
+ LIBUSB_CLASS_PERSONAL_HEALTHCARE = 0x0f,
+
+ /** Diagnostic Device */
+ LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
+
/** Wireless class */
LIBUSB_CLASS_WIRELESS = 0xe0,
@@ -675,6 +694,25 @@ typedef struct libusb_device libusb_device;
*/
typedef struct libusb_device_handle libusb_device_handle;
+/** \ingroup dev
+ * Speed codes. Indicates the speed at which the device is operating.
+ */
+enum libusb_speed {
+ /** The OS doesn't report or know the device speed. */
+ LIBUSB_SPEED_UNKNOWN = 0,
+
+ /** The device is operating at low speed (1.5MBit/s). */
+ LIBUSB_SPEED_LOW = 1,
+
+ /** The device is operating at full speed (12MBit/s). */
+ LIBUSB_SPEED_FULL = 2,
+
+ /** The device is operating at high speed (480MBit/s). */
+ LIBUSB_SPEED_HIGH = 3,
+
+ /** The device is operating at super speed (5000MBit/s). */
+ LIBUSB_SPEED_SUPER = 4,
+};
/** \ingroup misc
* Error codes. Most libusb functions return 0 on success or one of these
@@ -892,6 +930,7 @@ uint8_t LIBUSB_CALL libusb_get_port_number(libusb_device *dev);
libusb_device * LIBUSB_CALL libusb_get_parent(libusb_device *dev);
int LIBUSB_CALL libusb_get_port_path(libusb_context *ctx, libusb_device *dev, uint8_t* path, uint8_t path_length);
uint8_t LIBUSB_CALL libusb_get_device_address(libusb_device *dev);
+enum libusb_speed LIBUSB_CALL libusb_get_device_speed(libusb_device *dev);
int LIBUSB_CALL libusb_get_max_packet_size(libusb_device *dev,
unsigned char endpoint);
int LIBUSB_CALL libusb_get_max_iso_packet_size(libusb_device *dev,
@@ -1351,4 +1390,4 @@ void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx,
}
#endif
-#endif
+#endif \ No newline at end of file
diff --git a/libusb-1.0/lib/Win32/Debug/libusb-1.0.dll b/libusb-1.0/lib/Win32/Debug/libusb-1.0.dll
index 2ae0792..a897c24 100644
--- a/libusb-1.0/lib/Win32/Debug/libusb-1.0.dll
+++ b/libusb-1.0/lib/Win32/Debug/libusb-1.0.dll
Binary files differ
diff --git a/libusb-1.0/lib/Win32/Debug/libusb-1.0.lib b/libusb-1.0/lib/Win32/Debug/libusb-1.0.lib
index 3778dda..4b4773f 100644
--- a/libusb-1.0/lib/Win32/Debug/libusb-1.0.lib
+++ b/libusb-1.0/lib/Win32/Debug/libusb-1.0.lib
Binary files differ
diff --git a/libusb-1.0/lib/Win32/Debug/libusb-1.0.pdb b/libusb-1.0/lib/Win32/Debug/libusb-1.0.pdb
new file mode 100644
index 0000000..02dc084
--- /dev/null
+++ b/libusb-1.0/lib/Win32/Debug/libusb-1.0.pdb
Binary files differ
diff --git a/libusb-1.0/lib/Win32/Release/libusb-1.0.dll b/libusb-1.0/lib/Win32/Release/libusb-1.0.dll
index 944faee..6a3f346 100644
--- a/libusb-1.0/lib/Win32/Release/libusb-1.0.dll
+++ b/libusb-1.0/lib/Win32/Release/libusb-1.0.dll
Binary files differ
diff --git a/libusb-1.0/lib/Win32/Release/libusb-1.0.lib b/libusb-1.0/lib/Win32/Release/libusb-1.0.lib
index e502d6d..5f6b31b 100644
--- a/libusb-1.0/lib/Win32/Release/libusb-1.0.lib
+++ b/libusb-1.0/lib/Win32/Release/libusb-1.0.lib
Binary files differ