pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split USB initialization and connection

Browse Source 
This will allow to execute other USB calls (retrieving the device list
for example) before connecting to the selected device.

PR #2974 <https://github.com/Genymobile/scrcpy/pull/2974>
This commit is contained in:
Romain Vimont
2022-01-25 19:10:23 +01:00
parent 2114f48185
commit bbef426a4b
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/usb/usb.c
View File

@@ -76,18 +76,23 @@ sc_usb_open_handle(libusb_device *device) {
}
bool
sc_usb_init(struct sc_usb *usb, const char *serial) {
assert(serial);
sc_usb_init(struct sc_usb *usb) {
usb->handle = NULL;
return libusb_init(&usb->context) == LIBUSB_SUCCESS;
}
// There is only one device, initialize the context here
if (libusb_init(&usb->context) != LIBUSB_SUCCESS) {
return false;
}
void
sc_usb_destroy(struct sc_usb *usb) {
libusb_exit(usb->context);
}
bool
sc_usb_connect(struct sc_usb *usb, const char *serial) {
assert(serial);
libusb_device *device = sc_usb_find_device(usb, serial);
if (!device) {
LOGW("USB device %s not found", serial);
libusb_exit(usb->context);
return false;
}
@@ -95,7 +100,6 @@ sc_usb_init(struct sc_usb *usb, const char *serial) {
libusb_unref_device(device);
if (!usb->handle) {
LOGW("Could not open USB device %s", serial);
libusb_exit(usb->context);
return false;
}
@@ -103,7 +107,6 @@ sc_usb_init(struct sc_usb *usb, const char *serial) {
}
void
sc_usb_destroy(struct sc_usb *usb) {
sc_usb_disconnect(struct sc_usb *usb) {
libusb_close(usb->handle);
libusb_exit(usb->context);
}