summaryrefslogtreecommitdiff
path: root/transport.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-30 17:32:03 -0700
committerElliott Hughes <enh@google.com>2015-05-01 15:55:37 -0700
commit080c004a20ead6229e2bef1a04f30c6cbf44a0c0 (patch)
tree5eae0ad266a6ac7680a12dd088142c1fb953fc7c /transport.h
parent2f421aacbec93c350d97bd89cc27adc200da5a68 (diff)
downloadadb-080c004a20ead6229e2bef1a04f30c6cbf44a0c0.tar.gz
More adb buffer fixes.
This patch factors out a lot of the basic protocol code: sending OKAY, sending FAIL, and sending a length-prefixed string. ADB_TRACE has been non-optional for a long time, so let's just remove the #ifs. Also actually build the device tracker test tool (and remove its duplicate). Bug: http://b/20666660 Change-Id: I6c7d59f18707bdc62ca69dea45547617f9f31fc6
Diffstat (limited to 'transport.h')
-rw-r--r--transport.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/transport.h b/transport.h
index a2077e8..5b6fdac 100644
--- a/transport.h
+++ b/transport.h
@@ -23,10 +23,6 @@
#include "adb.h"
-#if ADB_TRACE
-void dump_hex(const unsigned char* ptr, size_t len);
-#endif
-
/*
* Obtain a transport from the available transports.
* If state is != CS_ANY, only transports in that state are considered.
@@ -45,7 +41,7 @@ void update_transports(void);
** get_device_transport does an acquire on your behalf before returning
*/
void init_transport_registration(void);
-int list_transports(char* buf, size_t bufsize, int long_listing);
+std::string list_transports(bool long_listing);
atransport* find_transport(const char* serial);
void register_usb_transport(usb_handle* h, const char* serial,