diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-14 08:37:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-14 08:37:37 -0700 |
| commit | 51a958645ce9aeb4f8dc56d66a85d0005273a6ca (patch) | |
| tree | 099926bb5e832ef87385b5f8160e1c5449f54a45 /adb | |
| parent | b6416ff30d4a582840531222932643549f1ba20a (diff) | |
| parent | 9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3 (diff) | |
| download | system_core-51a958645ce9aeb4f8dc56d66a85d0005273a6ca.zip system_core-51a958645ce9aeb4f8dc56d66a85d0005273a6ca.tar.gz system_core-51a958645ce9aeb4f8dc56d66a85d0005273a6ca.tar.bz2 | |
am 9dbcbe08: am 9bdedb59: am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost issue"
* commit '9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3':
adb: usb_windows: fix adb connection lost issue
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/usb_windows.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/usb_windows.c b/adb/usb_windows.c index a2fbb79..4936b77 100644 --- a/adb/usb_windows.c +++ b/adb/usb_windows.c @@ -255,7 +255,7 @@ usb_handle* do_usb_open(const wchar_t* interface_name) { } 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; int ret; @@ -300,7 +300,7 @@ int usb_write(usb_handle* handle, const void* data, int len) { } 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; @@ -322,7 +322,7 @@ int usb_read(usb_handle *handle, void* data, int len) { if (len == 0) return 0; - } else if (saved_errno != ERROR_SEM_TIMEOUT) { + } else { // assume ERROR_INVALID_HANDLE indicates we are disconnected if (saved_errno == ERROR_INVALID_HANDLE) usb_kick(handle); |