Merge "Lose USB transport code to libadb." (4db055d6) · Commits · e / tools / etwrp

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ LOCAL_STATIC_LIBRARIES := \
		libmtdutils \
		libmincrypt \
		libminadbd \
		libadb \
		libadbd \
		libfusesideload \
		libminui \
		libpng \

minadbd/Android.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -13,11 +13,8 @@ include $(CLEAR_VARS)
		LOCAL_SRC_FILES := \
		adb.c \
		fuse_adb_provider.c \
		transport.c \
		transport_usb.c \
		sockets.c \
		services.c \
		usb_linux_client.c \
		utils.c

		LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter

minadbd/adb.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,8 @@ void close_usb_devices();
		void unregister_transport(atransport *t);
		void unregister_all_tcp_transports();

		void register_usb_transport(usb_handle h, const char serial, unsigned writeable);
		void register_usb_transport(usb_handle h, const char serial,
		const char* dev_path, unsigned writeable);

		/* this should only be used for transports with connection_state == CS_NOPERM */
		void unregister_usb_transport(usb_handle *usb);

minadbd/transport.c

deleted100644 → 0

+0 −803

File deleted.

Preview size limit exceeded, changes collapsed.

minadbd/transport_usb.c

deleted100644 → 0

+0 −121

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		#include <stdio.h>
		#include <stdlib.h>
		#include <string.h>

		#include <sysdeps.h>

		#define TRACE_TAG TRACE_TRANSPORT
		#include "adb.h"

		#ifdef HAVE_BIG_ENDIAN
		#define H4(x) (((x) & 0xFF000000) >> 24) \| (((x) & 0x00FF0000) >> 8) \| (((x) & 0x0000FF00) << 8) \| (((x) & 0x000000FF) << 24)
		static inline void fix_endians(apacket *p)
		{
		p->msg.command = H4(p->msg.command);
		p->msg.arg0 = H4(p->msg.arg0);
		p->msg.arg1 = H4(p->msg.arg1);
		p->msg.data_length = H4(p->msg.data_length);
		p->msg.data_check = H4(p->msg.data_check);
		p->msg.magic = H4(p->msg.magic);
		}
		unsigned host_to_le32(unsigned n)
		{
		return H4(n);
		}
		#else
		#define fix_endians(p) do {} while (0)
		unsigned host_to_le32(unsigned n)
		{
		return n;
		}
		#endif

		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;
		}

		fix_endians(p);

		if(check_header(p)) {
		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;

		fix_endians(p);

		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, int 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;

		HOST = 0;
		}