Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Find device with USB context

Browse source 
An explicit context was used everywhere except for listing the devices.

PR #2974 <https://github.com/Genymobile/scrcpy/pull/2974>
This commit is contained in:
Romain Vimont 2022-01-26 21:42:26 +01:00
parent b779eca8d3
commit 2114f48185
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/usb/usb.c
View file

@ -42,10 +42,10 @@ accept_device(libusb_device *device, const char *serial) {
} }
static libusb_device * static libusb_device *
sc_usb_find_device(const char *serial) { sc_usb_find_device(struct sc_usb *usb, const char *serial) {
libusb_device **list; libusb_device **list;
libusb_device *result = NULL; libusb_device *result = NULL;
ssize_t count = libusb_get_device_list(NULL, &list); ssize_t count = libusb_get_device_list(usb->context, &list);
if (count < 0) { if (count < 0) {
log_libusb_error((enum libusb_error) count); log_libusb_error((enum libusb_error) count);
return NULL; return NULL;
@ -84,7 +84,7 @@ sc_usb_init(struct sc_usb *usb, const char *serial) {
return false; return false;
} }
libusb_device *device = sc_usb_find_device(serial); libusb_device *device = sc_usb_find_device(usb, serial);
if (!device) { if (!device) {
LOGW("USB device %s not found", serial); LOGW("USB device %s not found", serial);
libusb_exit(usb->context); libusb_exit(usb->context);