ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: Move io_setup to usb_handle init" am: adf07c5428

Browse source 
am: 7531a6a167

Change-Id: Ic7a75b2670158bc8896a1e277745d97f598bc228
This commit is contained in:
Jerry Zhang 2018-05-16 16:36:37 -07:00 • committed by android-build-merger
commit 8d714e15f4
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/daemon/usb.cpp
View file

@ -234,6 +234,10 @@ static void aio_block_init(aio_block* aiob) {
for (unsigned i = 0; i < USB_FFS_NUM_BUFS; i++) {
aiob->iocbs[i] = &aiob->iocb[i];
}
memset(&aiob->ctx, 0, sizeof(aiob->ctx));
if (io_setup(USB_FFS_NUM_BUFS, &aiob->ctx)) {
D("[ aio: got error on io_setup (%d) ]", errno);
}
}
static int getMaxPacketSize(int ffs_fd) {
@ -312,13 +316,6 @@ bool init_functionfs(struct usb_handle* h) {
goto err;
}
memset(&h->read_aiob.ctx, 0, sizeof(h->read_aiob.ctx));
memset(&h->write_aiob.ctx, 0, sizeof(h->write_aiob.ctx));
if (io_setup(USB_FFS_NUM_BUFS, &h->read_aiob.ctx) ||
io_setup(USB_FFS_NUM_BUFS, &h->write_aiob.ctx)) {
D("[ aio: got error on io_setup (%d) ]", errno);
}
h->read_aiob.fd = h->bulk_out;
h->write_aiob.fd = h->bulk_in;
return true;
@ -500,8 +497,6 @@ static void usb_ffs_close(usb_handle* h) {
h->kicked = false;
adb_close(h->bulk_out);
adb_close(h->bulk_in);
io_destroy(h->read_aiob.ctx);
io_destroy(h->write_aiob.ctx);
// Notify usb_adb_open_thread to open a new connection.
h->lock.lock();