Windows (usbdk): Remove unnecessary/unused structure

[platform/upstream/libusb.git] / libusb / libusb.h

diff --git a/libusb/libusb.h b/libusb/libusb.h
index 9285b1d..c7dccc0 100644 (file)
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -90,7 +90,7 @@ typedef unsigned __int32  uint32_t;
  * 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).
+ * passed to functions in the generated assembly code).
  *
  * Matching the Windows API itself, libusb uses the WINAPI convention (which
  * translates to the <tt>stdcall</tt> convention) and guarantees that the
@@ -138,13 +138,10 @@ typedef unsigned __int32  uint32_t;
  * #endif
  * \endcode
  *
- * 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, LIBUSB_API_VERSION is defined as follows:
  * (libusb major << 24) | (libusb minor << 16) | (16 bit incremental)
  */
-#define LIBUSB_API_VERSION 0x01000103
+#define LIBUSB_API_VERSION 0x01000105
 
 /* The following is kept for compatibility, but will be deprecated in the future */
 #define LIBUSBX_API_VERSION LIBUSB_API_VERSION
@@ -668,8 +665,9 @@ struct libusb_config_descriptor {
        uint8_t  bmAttributes;
 
        /** 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. */
+        * configuration when the device is fully operation. Expressed in units
+        * of 2 mA when the device is operating in high-speed mode and in units
+        * of 8 mA when the device is operating in super-speed mode. */
        uint8_t  MaxPower;
 
        /** Array of interfaces supported by this configuration. The length of
@@ -702,7 +700,7 @@ struct libusb_ss_endpoint_companion_descriptor {
 
 
        /** The maximum number of packets the endpoint can send or
-        *  recieve as part of a burst. */
+        *  receive as part of a burst. */
        uint8_t  bMaxBurst;
 
        /** In bulk EP: bits 4:0 represents the maximum number of
@@ -1803,6 +1801,7 @@ void LIBUSB_CALL libusb_lock_events(libusb_context *ctx);
 void LIBUSB_CALL libusb_unlock_events(libusb_context *ctx);
 int LIBUSB_CALL libusb_event_handling_ok(libusb_context *ctx);
 int LIBUSB_CALL libusb_event_handler_active(libusb_context *ctx);
+void LIBUSB_CALL libusb_interrupt_event_handler(libusb_context *ctx);
 void LIBUSB_CALL libusb_lock_event_waiters(libusb_context *ctx);
 void LIBUSB_CALL libusb_unlock_event_waiters(libusb_context *ctx);
 int LIBUSB_CALL libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
@@ -1859,6 +1858,7 @@ typedef void (LIBUSB_CALL *libusb_pollfd_removed_cb)(int fd, void *user_data);
 
 const struct libusb_pollfd ** LIBUSB_CALL libusb_get_pollfds(
        libusb_context *ctx);
+void LIBUSB_CALL libusb_free_pollfds(const struct libusb_pollfd **pollfds);
 void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx,
        libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
        void *user_data);
@@ -1883,8 +1883,11 @@ typedef int libusb_hotplug_callback_handle;
  *
  * Flags for hotplug events */
 typedef enum {
+       /** Default value when not using any flags. */
+       LIBUSB_HOTPLUG_NO_FLAGS = 0,
+
        /** Arm the callback and fire it for all matching currently attached devices. */
-       LIBUSB_HOTPLUG_ENUMERATE = 1,
+       LIBUSB_HOTPLUG_ENUMERATE = 1<<0,
 } libusb_hotplug_flag;
 
 /** \ingroup hotplug