3d2904cdf2
The reason behing this change is to increase the adb push/pull speed
with reduceing the number of packets sent between the host and the
device because the communication is heavily bound by packet latency.
The change maintains two way compatibility in the communication
protocol with negotiating a packet size between the target and the
host with the CONNECT packets.
After this change the push/pull speeds improved significantly
(measured from Linux-x86_64 with 100MB of data):
| Old push | Old pull || New push | New pull |
-----------------------------------------------------------
Hammerhead | 4.6 MB/s | 3.9 MB/s || 13.1 MB/s | 16.5 MB/s |
-----------------------------------------------------------
Volantis | 6.0 MB/s | 6.2 MS/s || 25.9 MB/s | 29.0 MB/s |
-----------------------------------------------------------
Fugu | 6.0 MB/s | 5.1 MB/s || 27.9 MB/s | 33.2 MB/s |
-----------------------------------------------------------
Change-Id: Id9625de31266e43394289e325c7e7e473379c5d8
107 lines
2.5 KiB
C++
107 lines
2.5 KiB
C++
/*
|
|
* Copyright (C) 2007 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#define TRACE_TAG TRACE_TRANSPORT
|
|
|
|
#include "sysdeps.h"
|
|
#include "transport.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "adb.h"
|
|
|
|
static int remote_read(apacket *p, atransport *t)
|
|
{
|
|
if(usb_read(t->usb, &p->msg, sizeof(amessage))){
|
|
D("remote usb: read terminated (message)\n");
|
|
return -1;
|
|
}
|
|
|
|
if(check_header(p, t)) {
|
|
D("remote usb: check_header failed\n");
|
|
return -1;
|
|
}
|
|
|
|
if(p->msg.data_length) {
|
|
if(usb_read(t->usb, p->data, p->msg.data_length)){
|
|
D("remote usb: terminated (data)\n");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if(check_data(p)) {
|
|
D("remote usb: check_data failed\n");
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int remote_write(apacket *p, atransport *t)
|
|
{
|
|
unsigned size = p->msg.data_length;
|
|
|
|
if(usb_write(t->usb, &p->msg, sizeof(amessage))) {
|
|
D("remote usb: 1 - write terminated\n");
|
|
return -1;
|
|
}
|
|
if(p->msg.data_length == 0) return 0;
|
|
if(usb_write(t->usb, &p->data, size)) {
|
|
D("remote usb: 2 - write terminated\n");
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void remote_close(atransport *t)
|
|
{
|
|
usb_close(t->usb);
|
|
t->usb = 0;
|
|
}
|
|
|
|
static void remote_kick(atransport *t)
|
|
{
|
|
usb_kick(t->usb);
|
|
}
|
|
|
|
void init_usb_transport(atransport *t, usb_handle *h, ConnectionState state)
|
|
{
|
|
D("transport: usb\n");
|
|
t->close = remote_close;
|
|
t->kick = remote_kick;
|
|
t->read_from_remote = remote_read;
|
|
t->write_to_remote = remote_write;
|
|
t->sync_token = 1;
|
|
t->connection_state = state;
|
|
t->type = kTransportUsb;
|
|
t->usb = h;
|
|
|
|
#if ADB_HOST
|
|
HOST = 1;
|
|
#else
|
|
HOST = 0;
|
|
#endif
|
|
}
|
|
|
|
#if ADB_HOST
|
|
int is_adb_interface(int vid, int pid, int usb_class, int usb_subclass, int usb_protocol)
|
|
{
|
|
return (usb_class == ADB_CLASS && usb_subclass == ADB_SUBCLASS && usb_protocol == ADB_PROTOCOL);
|
|
}
|
|
#endif
|