Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5defe75 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '89cc750e':
  Don't limit Windows USB reads.
parents 2fc8a91e 89cc750e
Loading
Loading
Loading
Loading
+3 −10
Original line number Diff line number Diff line
@@ -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) {
  unsigned long time_out = 0;
  unsigned long read = 0;
  int ret;

  D("usb_read %d\n", len);
  if (NULL != handle) {
  if (handle != nullptr) {
    while (len > 0) {
      int xfer = (len > 4096) ? 4096 : len;

      ret = AdbReadEndpointSync(handle->adb_read_pipe,
                                  data,
                                  (unsigned long)xfer,
                                  &read,
                                  time_out);
      int ret = AdbReadEndpointSync(handle->adb_read_pipe, data, len, &read, time_out);
      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) {
        data = (char *)data + read;
        len -= read;