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

am 89cc750e: Merge "Don\'t limit Windows USB reads."

Browse source 
* commit '89cc750e9b2623aae3c257ce6c72f4ffe3e1bb33':
  Don't limit Windows USB reads.
This commit is contained in:
Elliott Hughes 2015-07-23 18:28:39 +00:00 • committed by Android Git Automerger
commit f5defe7523
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/usb_windows.cpp
View file

@ -298,20 +298,13 @@ 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 = 0; unsigned long time_out = 0;
unsigned long read = 0; unsigned long read = 0;
int ret;
D("usb_read %d\n", len); D("usb_read %d\n", len);
if (NULL != handle) { if (handle != nullptr) {
while (len > 0) { while (len > 0) {
int xfer = (len > 4096) ? 4096 : len; int ret = AdbReadEndpointSync(handle->adb_read_pipe, data, len, &read, time_out);
ret = AdbReadEndpointSync(handle->adb_read_pipe,
data,
(unsigned long)xfer,
&read,
time_out);
int saved_errno = GetLastError(); int saved_errno = GetLastError();
D("usb_write got: %ld, expected: %d, errno: %d\n", read, xfer, saved_errno); D("usb_write got: %ld, expected: %d, errno: %d\n", read, len, saved_errno);
if (ret) { if (ret) {
data = (char *)data + read; data = (char *)data + read;
len -= read; len -= read;