summaryrefslogtreecommitdiffstats
path: root/adb/adb.h
diff options
context:
space:
mode:
Diffstat (limited to 'adb/adb.h')
-rw-r--r--adb/adb.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/adb/adb.h b/adb/adb.h
index aea5fb86b..d6b2b818f 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -139,7 +139,7 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply
139int get_available_local_transport_index(); 139int get_available_local_transport_index();
140#endif 140#endif
141int init_socket_transport(atransport *t, int s, int port, int local); 141int init_socket_transport(atransport *t, int s, int port, int local);
142void init_usb_transport(atransport *t, usb_handle *usb, ConnectionState state); 142void init_usb_transport(atransport* t, usb_handle* usb);
143 143
144std::string getEmulatorSerialString(int console_port); 144std::string getEmulatorSerialString(int console_port);
145#if ADB_HOST 145#if ADB_HOST
@@ -222,7 +222,24 @@ void handle_online(atransport *t);
222void handle_offline(atransport *t); 222void handle_offline(atransport *t);
223 223
224void send_connect(atransport *t); 224void send_connect(atransport *t);
225#if ADB_HOST
226void SendConnectOnHost(atransport* t);
227#endif
225 228
226void parse_banner(const std::string&, atransport* t); 229void parse_banner(const std::string&, atransport* t);
227 230
231// On startup, the adb server needs to wait until all of the connected devices are ready.
232// To do this, we need to know when the scan has identified all of the potential new transports, and
233// when each transport becomes ready.
234// TODO: Do this for mDNS as well, instead of just USB?
235
236// We've found all of the transports we potentially care about.
237void adb_notify_device_scan_complete();
238
239// One or more transports have changed status, check to see if we're ready.
240void update_transport_status();
241
242// Wait until device scan has completed and every transport is ready, or a timeout elapses.
243void adb_wait_for_device_initialization();
244
228#endif 245#endif