diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libusb/libusb.h | 3 | ||||
| -rw-r--r-- | libusb/libusb_version.h | 2 | ||||
| -rw-r--r-- | libusb/os/windows_usb.c | 16 | ||||
| -rw-r--r-- | libusb/os/windows_usb.h | 7 |
5 files changed, 9 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 411543f..fcf32fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ m4_define(LIBUSB_MAJOR, [1]) m4_define(LIBUSB_MINOR, [0]) m4_define(LIBUSB_MICRO, [8]) -m4_define(LIBUSB_NANO, [10335]) +m4_define(LIBUSB_NANO, [10336]) AC_INIT([libusb], LIBUSB_MAJOR.LIBUSB_MINOR.LIBUSB_MICRO, [libusb-devel@lists.sourceforge.net], [libusb], [http://www.libusb.org/]) @@ -80,7 +80,7 @@ esac if test "$backend" = windows; then AC_DEFINE(OS_WINDOWS, 1, [Windows backend]) AC_SUBST(OS_WINDOWS) - PC_LIBS_PRIVATE="-lsetupapi -lole32 -ladvapi32" + PC_LIBS_PRIVATE="" LTLDFLAGS="${LTLDFLAGS} -avoid-version -Wl,--add-stdcall-alias" AC_CHECK_TOOL(RC, windres, no) AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument]) diff --git a/libusb/libusb.h b/libusb/libusb.h index 4719dd1..d466109 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -1296,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); diff --git a/libusb/libusb_version.h b/libusb/libusb_version.h index cde1ce3..fdce667 100644 --- a/libusb/libusb_version.h +++ b/libusb/libusb_version.h @@ -24,6 +24,6 @@ #define LIBUSB_VERSION_MAJOR 1 #define LIBUSB_VERSION_MINOR 0 #define LIBUSB_VERSION_MICRO 8 -#define LIBUSB_VERSION_NANO 10335 +#define LIBUSB_VERSION_NANO 10336 #endif diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 5f5b3b7..2e6c6ac 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -2952,16 +2952,12 @@ static int composite_submit_control_transfer(struct usbi_transfer *itransfer) struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev); struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev); - int i, pass; - - // Interface shouldn't matter for control, but it does in practice, with Windows' - // restrictions with regards to accessing HID keyboards and mice. Try a 2 pass approach - for (pass = 0; pass < 2; pass++) { - for (i=0; i<USB_MAXINTERFACES; i++) { - if (priv->usb_interface[i].path != NULL) { - usbi_dbg("using interface %d", i); - return priv->usb_interface[i].apib->submit_control_transfer(itransfer); - } + int i; + + for (i=0; i<USB_MAXINTERFACES; i++) { + if (priv->usb_interface[i].path != NULL) { + usbi_dbg("using interface %d", i); + return priv->usb_interface[i].apib->submit_control_transfer(itransfer); } } diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h index 58b4452..4cecc33 100644 --- a/libusb/os/windows_usb.h +++ b/libusb/os/windows_usb.h @@ -80,8 +80,6 @@ inline void upperize(char* str) { #define MAX_CTRL_BUFFER_LENGTH 4096 #define MAX_USB_DEVICES 256 #define MAX_USB_STRING_LENGTH 128 -#define MAX_HID_REPORT_SIZE 1024 -#define MAX_HID_DESCRIPTOR_SIZE 256 #define MAX_GUID_STRING_LENGTH 40 #define MAX_PATH_LENGTH 128 #define MAX_KEY_LENGTH 256 @@ -91,11 +89,6 @@ inline void upperize(char* str) { #define LIST_SEPARATOR ';' #define HTAB_SIZE 1021 -// Handle code for HID interface that have been claimed ("dibs") -#define INTERFACE_CLAIMED ((HANDLE)(intptr_t)0xD1B5) -// Additional return code for HID operations that completed synchronously -#define LIBUSB_COMPLETED (LIBUSB_SUCCESS + 1) - // http://msdn.microsoft.com/en-us/library/ff545978.aspx // http://msdn.microsoft.com/en-us/library/ff545972.aspx // http://msdn.microsoft.com/en-us/library/ff545982.aspx |