661327e8e4
First, HOST is always 0 in adbd, which matches ADB_HOST=0. Second, HOST is always 1 when adb_main is called, which matches ADB_HOST=1. For adb client that doesn't call adb_main, it never touches local_init(), init_transport_registration() and fdevent_loop(). So the changes in adb.cpp, services.cpp and transport_local.cpp do nothing with it. As a conclusion, I think we can remove HOST and use ADB_HOST instead. Change-Id: Ide0e0eca7468b6c3c130f6b50974406280678b2e
101 lines
2.4 KiB
C++
101 lines
2.4 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
|
|
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
|