tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am c4eaebbe: am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"

Browse source 
* commit 'c4eaebbe7a0c125663f74e3961b62de8d3611a51':
  Enlarge USB bulk transfer size for faster downloads
This commit is contained in:
Conley Owens 2011-04-27 11:38:29 -07:00 committed by Android Git Automerger
commit 66acffad76
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fastboot/usb_linux.c
View file

@ -61,6 +61,11 @@
#define DBG1(x...)
#endif
/* The max bulk size for linux is 16384 which is defined
* in drivers/usb/core/devio.c.
*/
#define MAX_USBFS_BULK_SIZE (16 * 1024)
struct usb_handle
{
char fname[64];
@ -289,7 +294,7 @@ int usb_write(usb_handle *h, const void *_data, int len)
while(len > 0) {
int xfer;
xfer = (len > 4096) ? 4096 : len;
xfer = (len > MAX_USBFS_BULK_SIZE) ? MAX_USBFS_BULK_SIZE : len;
bulk.ep = h->ep_out;
bulk.len = xfer;
@ -323,7 +328,7 @@ int usb_read(usb_handle *h, void *_data, int len)
}
while(len > 0) {
int xfer = (len > 4096) ? 4096 : len;
int xfer = (len > MAX_USBFS_BULK_SIZE) ? MAX_USBFS_BULK_SIZE : len;
bulk.ep = h->ep_in;
bulk.len = xfer;

5
fastboot/usb_windows.c
View file

@ -42,6 +42,7 @@
#define DBG(x...)
#endif
#define MAX_USBFS_BULK_SIZE (1024 * 1024)
/** Structure usb_handle describes our connection to the usb device via
AdbWinApi.dll. This structure is returned from usb_open() routine and
@ -160,7 +161,7 @@ int usb_write(usb_handle* handle, const void* data, int len) {
if (NULL != handle) {
// Perform write
while(len > 0) {
int xfer = (len > 4096) ? 4096 : len;
int xfer = (len > MAX_USBFS_BULK_SIZE) ? MAX_USBFS_BULK_SIZE : len;
ret = AdbWriteEndpointSync(handle->adb_write_pipe,
(void*)data,
(unsigned long)xfer,
@ -200,7 +201,7 @@ int usb_read(usb_handle *handle, void* data, int len) {
DBG("usb_read %d\n", len);
if (NULL != handle) {
while (1) {
int xfer = (len > 4096) ? 4096 : len;
int xfer = (len > MAX_USBFS_BULK_SIZE) ? MAX_USBFS_BULK_SIZE : len;
ret = AdbReadEndpointSync(handle->adb_read_pipe,
(void*)data,