commit c2adf35c3d87622929dde3e06b0a7c9643e47dd5
author JP Abgrall <jpa@google.com> Tue May 06 02:31:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 06 02:31:00 2014 +0000
tree d8d0cbcf20dd72d90e23e4c011918b6854b58e6a
parent 0fd6750ed3116d29cc49cc721fbbd38b3033aa0f
parent 6d9ae28ed4ea917e3c6db12228b2b06d02489c11

am 6d9ae28e: am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"

* commit '6d9ae28ed4ea917e3c6db12228b2b06d02489c11':
  Fastboot: fix fastboot timeout issue of Windows host side

fastboot/usb_windows.c

diff --git a/fastboot/usb_windows.c b/fastboot/usb_windows.c
index 07f7be2..f666015 100644
--- a/fastboot/usb_windows.c
+++ b/fastboot/usb_windows.c
@@ -152,7 +152,7 @@
 }
 
 int usb_write(usb_handle* handle, const void* data, int len) {
-    unsigned long time_out = 500 + len * 8;
+    unsigned long time_out = 5000;
     unsigned long written = 0;
     unsigned count = 0;
     int ret;
@@ -194,7 +194,7 @@
 }
 
 int usb_read(usb_handle *handle, void* data, int len) {
-    unsigned long time_out = 500 + len * 8;
+    unsigned long time_out = 0;
     unsigned long read = 0;
     int ret;
 
@@ -212,7 +212,7 @@
             DBG("usb_read got: %ld, expected: %d, errno: %d\n", read, xfer, errno);
             if (ret) {
                 return read;
-            } else if (errno != ERROR_SEM_TIMEOUT) {
+            } else {
                 // assume ERROR_INVALID_HANDLE indicates we are disconnected
                 if (errno == ERROR_INVALID_HANDLE)
                     usb_kick(handle);