ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost issue"

Browse source 
* commit 'a36e1aa3db254d008f220a45899e1d70f4192619':
  adb: usb_windows: fix adb connection lost issue
This commit is contained in:
Jean-Baptiste Queru 2012-05-11 21:55:00 -07:00 • committed by Android Git Automerger
commit 9bdedb5998
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/usb_windows.c
View file

@ -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) { 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 long written = 0;
int ret; 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) { 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; unsigned long read = 0;
int ret; int ret;
@ -322,7 +322,7 @@ int usb_read(usb_handle *handle, void* data, int len) {
if (len == 0) if (len == 0)
return 0; return 0;
} else if (saved_errno != ERROR_SEM_TIMEOUT) { } else {
// assume ERROR_INVALID_HANDLE indicates we are disconnected // assume ERROR_INVALID_HANDLE indicates we are disconnected
if (saved_errno == ERROR_INVALID_HANDLE) if (saved_errno == ERROR_INVALID_HANDLE)
usb_kick(handle); usb_kick(handle);