tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adbd: rename daemon/usb.cpp to daemon/usb_legacy.cpp.

Browse source 
Change-Id: I0b369d1653220f7d9b542ad06998c5c2c3e129a2
Test: mma
This commit is contained in:
Josh Gao 2018-10-08 14:42:19 -07:00
parent d506dac0a0
commit 61e9e39b7e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/Android.bp
View file

@ -313,8 +313,8 @@ cc_library_static {
srcs: libadb_srcs + libadb_posix_srcs + [
"daemon/auth.cpp",
"daemon/jdwp_service.cpp",
"daemon/usb.cpp",
"daemon/usb_ffs.cpp",
"daemon/usb_legacy.cpp",
],
local_include_dirs: [

7
adb/daemon/usb.cpp → adb/daemon/usb_legacy.cpp
View file

@ -94,7 +94,7 @@ static bool init_functionfs(struct usb_handle* h) {
return true;
}
static void usb_ffs_open_thread(usb_handle *usb) {
static void usb_ffs_open_thread(usb_handle* usb) {
adb_thread_setname("usb ffs open");
while (true) {
@ -265,7 +265,7 @@ static void usb_ffs_close(usb_handle* h) {
h->notify.notify_one();
}
usb_handle *create_usb_handle(unsigned num_bufs, unsigned io_size) {
usb_handle* create_usb_handle(unsigned num_bufs, unsigned io_size) {
usb_handle* h = new usb_handle();
if (android::base::GetBoolProperty("sys.usb.ffs.aio_compat", false)) {
@ -290,7 +290,8 @@ void usb_init() {
dummy_fd.reset(adb_open("/dev/null", O_WRONLY | O_CLOEXEC));
CHECK_NE(-1, dummy_fd.get());
std::thread(usb_ffs_open_thread, create_usb_handle(USB_FFS_NUM_BUFS, USB_FFS_BULK_SIZE)).detach();
std::thread(usb_ffs_open_thread, create_usb_handle(USB_FFS_NUM_BUFS, USB_FFS_BULK_SIZE))
.detach();
}
int usb_write(usb_handle* h, const void* data, int len) {