From 638420ef31b06dbf90956bafcabf1a49a8fd9563 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 27 Apr 2016 14:21:52 -0700 Subject: [PATCH] adb: close ep0 on disconnection. adbd on device kicks the usb connection when usb IO fails. But to notify adb on host to reconnect it, adbd needs to close ep0 to reset the usb connection. Otherwise, adb on host cann't connect the device unless the usb cable is reconnected or adb host server is restarted. This can be tested by using `adb reconnect device` command. Bug: 25935458 Change-Id: I80979d6029e60b9cfd218f7b9b5201810238ec07 (cherry picked from commit 69e97e4bee9ee43ef55d1bb205bc4ca065d089bc) --- adb/usb_linux_client.cpp | 51 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/adb/usb_linux_client.cpp b/adb/usb_linux_client.cpp index 0ba6b4bb2..c10b48cae 100644 --- a/adb/usb_linux_client.cpp +++ b/adb/usb_linux_client.cpp @@ -400,35 +400,33 @@ static bool init_functionfs(struct usb_handle *h) v2_descriptor.os_header = os_desc_header; v2_descriptor.os_desc = os_desc_compat; - if (h->control < 0) { // might have already done this before - D("OPENING %s", USB_FFS_ADB_EP0); - h->control = adb_open(USB_FFS_ADB_EP0, O_RDWR); - if (h->control < 0) { - D("[ %s: cannot open control endpoint: errno=%d]", USB_FFS_ADB_EP0, errno); + D("OPENING %s", USB_FFS_ADB_EP0); + h->control = adb_open(USB_FFS_ADB_EP0, O_RDWR); + if (h->control < 0) { + D("[ %s: cannot open control endpoint: errno=%d]", USB_FFS_ADB_EP0, errno); + goto err; + } + + ret = adb_write(h->control, &v2_descriptor, sizeof(v2_descriptor)); + if (ret < 0) { + v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC); + v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor)); + v1_descriptor.header.fs_count = 3; + v1_descriptor.header.hs_count = 3; + v1_descriptor.fs_descs = fs_descriptors; + v1_descriptor.hs_descs = hs_descriptors; + D("[ %s: Switching to V1_descriptor format errno=%d ]", USB_FFS_ADB_EP0, errno); + ret = adb_write(h->control, &v1_descriptor, sizeof(v1_descriptor)); + if (ret < 0) { + D("[ %s: write descriptors failed: errno=%d ]", USB_FFS_ADB_EP0, errno); goto err; } + } - ret = adb_write(h->control, &v2_descriptor, sizeof(v2_descriptor)); - if (ret < 0) { - v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC); - v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor)); - v1_descriptor.header.fs_count = 3; - v1_descriptor.header.hs_count = 3; - v1_descriptor.fs_descs = fs_descriptors; - v1_descriptor.hs_descs = hs_descriptors; - D("[ %s: Switching to V1_descriptor format errno=%d ]", USB_FFS_ADB_EP0, errno); - ret = adb_write(h->control, &v1_descriptor, sizeof(v1_descriptor)); - if (ret < 0) { - D("[ %s: write descriptors failed: errno=%d ]", USB_FFS_ADB_EP0, errno); - goto err; - } - } - - ret = adb_write(h->control, &strings, sizeof(strings)); - if (ret < 0) { - D("[ %s: writing strings failed: errno=%d]", USB_FFS_ADB_EP0, errno); - goto err; - } + ret = adb_write(h->control, &strings, sizeof(strings)); + if (ret < 0) { + D("[ %s: writing strings failed: errno=%d]", USB_FFS_ADB_EP0, errno); + goto err; } h->bulk_out = adb_open(USB_FFS_ADB_OUT, O_RDWR); @@ -556,6 +554,7 @@ static void usb_ffs_close(usb_handle *h) { h->kicked = false; adb_close(h->bulk_out); adb_close(h->bulk_in); + adb_close(h->control); // Notify usb_adb_open_thread to open a new connection. adb_mutex_lock(&h->lock); h->open_new_connection = true;