diff options
author | Colin Cross <ccross@android.com> | 2014-01-27 21:46:36 +0100 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 21:46:36 +0100 |
commit | 4068f6aff2f898c55e6f8f3e2c92eefbb9189524 (patch) | |
tree | fb59803a356d869fd20b2c2135cf0ae9990b4595 | |
parent | am f4641299: am 295e74aa: Merge "adbd: switch to su domain when running as root" (diff) | |
parent | am f3532072: Merge "minadbd: remove dead code" (diff) | |
download | android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.tar android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.tar.gz android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.tar.bz2 android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.tar.lz android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.tar.xz android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.tar.zst android_bootable_recovery-4068f6aff2f898c55e6f8f3e2c92eefbb9189524.zip |
-rw-r--r-- | minadbd/adb.h | 4 | ||||
-rw-r--r-- | minadbd/transport.c | 21 |
2 files changed, 0 insertions, 25 deletions
diff --git a/minadbd/adb.h b/minadbd/adb.h index 98fa5972e..688a6f273 100644 --- a/minadbd/adb.h +++ b/minadbd/adb.h @@ -244,15 +244,11 @@ void kick_transport( atransport* t ); #if ADB_HOST int get_available_local_transport_index(); #endif -int init_socket_transport(atransport *t, int s, int port, int local); void init_usb_transport(atransport *t, usb_handle *usb, int state); /* for MacOS X cleanup */ 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 */ void unregister_transport(atransport *t); void unregister_all_tcp_transports(); diff --git a/minadbd/transport.c b/minadbd/transport.c index ff2004932..4c0c97f75 100644 --- a/minadbd/transport.c +++ b/minadbd/transport.c @@ -678,27 +678,6 @@ retry: 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) { atransport *t = calloc(1, sizeof(atransport)); |