diff options
author | Hans de Goede <hdegoede@redhat.com> | 2013-05-15 12:17:42 +0200 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2013-05-15 20:43:35 +0200 |
commit | 86031e26ad8c1516ded02a06834312951a7a0492 (patch) | |
tree | 0e8b9a2c1fead267a2265aa63fb5ac93c794d1e7 /libusb/libusb.h | |
parent | 6853291ed0c7a783d01be3f8813988fc6e5c5ac3 (diff) | |
download | android_external_libusbx-86031e26ad8c1516ded02a06834312951a7a0492.tar.gz android_external_libusbx-86031e26ad8c1516ded02a06834312951a7a0492.tar.bz2 android_external_libusbx-86031e26ad8c1516ded02a06834312951a7a0492.zip |
Bump LIBUSBX_API_VERSION for new hotplug API
And document the minimum version under which hotplug is supported
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'libusb/libusb.h')
-rw-r--r-- | libusb/libusb.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libusb/libusb.h b/libusb/libusb.h index 75613e6..6915875 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -137,7 +137,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 0x01000101 +#define LIBUSBX_API_VERSION 0x01000102 #ifdef __cplusplus extern "C" { @@ -1525,11 +1525,16 @@ void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx, * per libusb_context and it is safe to call libusb_hotplug_deregister_callback() * on an already deregisted callback. * + * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * * For more information, see \ref hotplug. */ typedef int libusb_hotplug_callback_handle; /** \ingroup hotplug + * + * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * * Flags for hotplug events */ typedef enum { /** Arm the callback and fire it for all matching currently attached devices. */ @@ -1537,6 +1542,9 @@ typedef enum { } libusb_hotplug_flag; /** \ingroup hotplug + * + * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * * Hotplug events */ typedef enum { /** A device has been plugged in and is ready to use */ @@ -1565,6 +1573,8 @@ typedef enum { * It is safe to call either libusb_hotplug_register_callback() or * libusb_hotplug_deregister_callback() from within a callback function. * + * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * * \param libusb_context context of this notification * \param device libusb_device this event occurred on * \param event event that occurred @@ -1585,6 +1595,8 @@ typedef int (LIBUSB_CALL *libusb_hotplug_callback_fn)(libusb_context *ctx, * armed until either it is deregistered with libusb_hotplug_deregister_callback() * or the supplied callback returns 1 to indicate it is finished processing events. * + * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * * \param[in] ctx context to register this callback with * \param[in] events bitwise or of events that will trigger this callback. See \ref * libusb_hotplug_event @@ -1612,6 +1624,8 @@ int LIBUSB_CALL libusb_hotplug_register_callback(libusb_context *ctx, * Deregister a callback from a libusb_context. This function is safe to call from within * a hotplug callback. * + * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * * \param[in] ctx context this callback is registered with * \param[in] handle the handle of the callback to deregister */ |