diff options
author | Benjamin Dobell <benjamin.dobell@glassechidna.com.au> | 2011-07-17 11:50:07 +0200 |
---|---|---|
committer | Benjamin Dobell <benjamin.dobell@glassechidna.com.au> | 2011-07-17 11:50:07 +0200 |
commit | 8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35 (patch) | |
tree | 7b40d7e1a5c28b2e05b01cd9e348aabd60f2d19c /libusb-1.0/include/libusb.h | |
parent | Altered the user interface slightly to prevent clipping on certain OS. (diff) | |
download | Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.gz Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.bz2 Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.lz Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.xz Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.zst Heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.zip |
Diffstat (limited to '')
-rw-r--r-- | libusb-1.0/include/libusb.h (renamed from libusb-1.0/libusb/libusb.h) | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libusb-1.0/libusb/libusb.h b/libusb-1.0/include/libusb.h index 72917ca..d466109 100644 --- a/libusb-1.0/libusb/libusb.h +++ b/libusb-1.0/include/libusb.h @@ -96,7 +96,7 @@ typedef unsigned __int16 uint16_t; * return type, before the function name. See internal documentation for * API_EXPORTED. */ -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) #define LIBUSB_CALL WINAPI #else #define LIBUSB_CALL @@ -675,6 +675,7 @@ typedef struct libusb_device libusb_device; */ typedef struct libusb_device_handle libusb_device_handle; + /** \ingroup misc * Error codes. Most libusb functions return 0 on success or one of these * codes on failure. @@ -887,6 +888,9 @@ int LIBUSB_CALL libusb_get_config_descriptor_by_value(libusb_device *dev, void LIBUSB_CALL libusb_free_config_descriptor( struct libusb_config_descriptor *config); uint8_t LIBUSB_CALL libusb_get_bus_number(libusb_device *dev); +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); int LIBUSB_CALL libusb_get_max_packet_size(libusb_device *dev, unsigned char endpoint); @@ -1292,10 +1296,7 @@ int LIBUSB_CALL libusb_wait_for_event(libusb_context *ctx, struct timeval *tv); int LIBUSB_CALL libusb_handle_events_timeout(libusb_context *ctx, struct timeval *tv); -int LIBUSB_CALL libusb_handle_events_timeout_check(libusb_context *ctx, - struct timeval *tv, int *completed); int LIBUSB_CALL libusb_handle_events(libusb_context *ctx); -int LIBUSB_CALL libusb_handle_events_check(libusb_context *ctx, int *completed); int LIBUSB_CALL libusb_handle_events_locked(libusb_context *ctx, struct timeval *tv); int LIBUSB_CALL libusb_pollfds_handle_timeouts(libusb_context *ctx); |