openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: extract USB FFS read/write limit constants."

This commit is contained in:
Josh Gao 2015-12-17 22:29:12 +00:00 committed by Gerrit Code Review
parent d361582dc0 ae72b5aa4b
commit 1ff73936a7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
adb/usb_linux_client.cpp
View File

@ -30,6 +30,8 @@
#include <sys/types.h>
#include <unistd.h>
#include <algorithm>
#include "adb.h"
#include "transport.h"
@ -37,6 +39,13 @@
#define MAX_PACKET_SIZE_HS 512
#define MAX_PACKET_SIZE_SS 1024
// Writes larger than 16k fail on some devices (seed with 3.10.49-g209ea2f in particular).
#define USB_FFS_MAX_WRITE 16384
// The kernel allocates a contiguous buffer for reads, which can fail for large ones due to
// fragmentation. 16k chosen arbitrarily to match the write limit.
#define USB_FFS_MAX_READ 16384
#define cpu_to_le16(x) htole16(x)
#define cpu_to_le32(x) htole32(x)
@ -459,10 +468,9 @@ static void *usb_ffs_open_thread(void *x)
static int usb_ffs_write(usb_handle* h, const void* data, int len) {
D("about to write (fd=%d, len=%d)", h->bulk_in, len);
// Writes larger than 16k fail on some devices (seed with 3.10.49-g209ea2f in particular).
const char* buf = static_cast<const char*>(data);
while (len > 0) {
int write_len = (len > 16384) ? 16384 : len;
int write_len = std::min(USB_FFS_MAX_WRITE, len);
int n = adb_write(h->bulk_in, buf, write_len);
if (n < 0) {
D("ERROR: fd = %d, n = %d: %s", h->bulk_in, n, strerror(errno));
@ -481,7 +489,7 @@ static int usb_ffs_read(usb_handle* h, void* data, int len) {
char* buf = static_cast<char*>(data);
while (len > 0) {
int read_len = (len > 16384) ? 16384 : len;
int read_len = std::min(USB_FFS_MAX_READ, len);
int n = adb_read(h->bulk_out, buf, read_len);
if (n < 0) {
D("ERROR: fd = %d, n = %d: %s", h->bulk_out, n, strerror(errno));