Commit 9228ba3221fe747214d10eff4afe6dc1d3a5a4f4
2013-11-14T08:31:04
Only set the winusb pipe policy if it doesn't match our requirements instead of every transfer.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/compat/libusb-1.0/libusb/os/windows_usb.c b/compat/libusb-1.0/libusb/os/windows_usb.c
index 99c247d..f17cca3 100644
--- a/compat/libusb-1.0/libusb/os/windows_usb.c
+++ b/compat/libusb-1.0/libusb/os/windows_usb.c
@@ -2646,7 +2646,8 @@ static int winusb_submit_bulk_transfer(struct usbi_transfer *itransfer)
bool ret;
int current_interface;
struct winfd wfd;
- ULONG enable = 1;
+ ULONG ppolicy = sizeof(UCHAR);
+ UCHAR policy;
CHECK_WINUSB_AVAILABLE;
@@ -2669,11 +2670,20 @@ static int winusb_submit_bulk_transfer(struct usbi_transfer *itransfer)
}
if (IS_XFERIN(transfer)) {
- ret = WinUsb_SetPipePolicy(wfd.handle, transfer->endpoint, AUTO_CLEAR_STALL, sizeof(ULONG), &enable);
+ WinUsb_GetPipePolicy(wfd.handle, transfer->endpoint, AUTO_CLEAR_STALL, &ppolicy, &policy);
+ if (!policy) {
+ policy = TRUE;
+ WinUsb_SetPipePolicy(wfd.handle, transfer->endpoint, AUTO_CLEAR_STALL, ppolicy, &policy);
+ }
ret = WinUsb_ReadPipe(wfd.handle, transfer->endpoint, transfer->buffer, transfer->length, NULL, wfd.overlapped);
} else {
- if (transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET)
- ret = WinUsb_SetPipePolicy(wfd.handle, transfer->endpoint, SHORT_PACKET_TERMINATE, sizeof(ULONG), &enable);
+ if (transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) {
+ WinUsb_GetPipePolicy(wfd.handle, transfer->endpoint, SHORT_PACKET_TERMINATE, &ppolicy, &policy);
+ if (!policy) {
+ policy = TRUE;
+ WinUsb_SetPipePolicy(wfd.handle, transfer->endpoint, SHORT_PACKET_TERMINATE, ppolicy, &policy);
+ }
+ }
usbi_dbg("writing %d bytes", transfer->length);
ret = WinUsb_WritePipe(wfd.handle, transfer->endpoint, transfer->buffer, transfer->length, NULL, wfd.overlapped);
}