am f3532072: Merge "minadbd: remove dead code"
* commit 'f353207298ed14d0e6943353dd9788421a7537b8': minadbd: remove dead code
This commit is contained in:
@@ -244,15 +244,11 @@ void kick_transport( atransport* t );
|
|||||||
#if ADB_HOST
|
#if ADB_HOST
|
||||||
int get_available_local_transport_index();
|
int get_available_local_transport_index();
|
||||||
#endif
|
#endif
|
||||||
int init_socket_transport(atransport *t, int s, int port, int local);
|
|
||||||
void init_usb_transport(atransport *t, usb_handle *usb, int state);
|
void init_usb_transport(atransport *t, usb_handle *usb, int state);
|
||||||
|
|
||||||
/* for MacOS X cleanup */
|
/* for MacOS X cleanup */
|
||||||
void close_usb_devices();
|
void close_usb_devices();
|
||||||
|
|
||||||
/* cause new transports to be init'd and added to the list */
|
|
||||||
void register_socket_transport(int s, const char *serial, int port, int local);
|
|
||||||
|
|
||||||
/* these should only be used for the "adb disconnect" command */
|
/* these should only be used for the "adb disconnect" command */
|
||||||
void unregister_transport(atransport *t);
|
void unregister_transport(atransport *t);
|
||||||
void unregister_all_tcp_transports();
|
void unregister_all_tcp_transports();
|
||||||
|
|||||||
@@ -678,27 +678,6 @@ retry:
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void register_socket_transport(int s, const char *serial, int port, int local)
|
|
||||||
{
|
|
||||||
atransport *t = calloc(1, sizeof(atransport));
|
|
||||||
char buff[32];
|
|
||||||
|
|
||||||
if (!serial) {
|
|
||||||
snprintf(buff, sizeof buff, "T-%p", t);
|
|
||||||
serial = buff;
|
|
||||||
}
|
|
||||||
D("transport: %s init'ing for socket %d, on port %d\n", serial, s, port);
|
|
||||||
if ( init_socket_transport(t, s, port, local) < 0 ) {
|
|
||||||
adb_close(s);
|
|
||||||
free(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(serial) {
|
|
||||||
t->serial = strdup(serial);
|
|
||||||
}
|
|
||||||
register_transport(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
void register_usb_transport(usb_handle *usb, const char *serial, unsigned writeable)
|
void register_usb_transport(usb_handle *usb, const char *serial, unsigned writeable)
|
||||||
{
|
{
|
||||||
atransport *t = calloc(1, sizeof(atransport));
|
atransport *t = calloc(1, sizeof(atransport));
|
||||||
|
|||||||
Reference in New Issue
Block a user