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

Make serial optional to find USB devices

Browse source 
If no serial is provided, then list all available USB devices (which can
be open and having a serial).

PR #2974 <https://github.com/Genymobile/scrcpy/pull/2974>
This commit is contained in:
Romain Vimont 2022-01-26 22:15:23 +01:00
parent 1c17f57c10
commit 8fc9dca8cb
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,11 +53,14 @@ accept_device(libusb_device *device, const char *serial,
return false; return false;
} }
bool matches = !strcmp(serial, device_serial); if (serial) {
if (!matches) { // Filter by serial
free(device_serial); bool matches = !strcmp(serial, device_serial);
libusb_close(handle); if (!matches) {
return false; free(device_serial);
libusb_close(handle);
return false;
}
} }
out->device = libusb_ref_device(device); out->device = libusb_ref_device(device);
@ -90,8 +93,6 @@ sc_usb_device_destroy_all(struct sc_usb_device *usb_devices, size_t count) {
ssize_t ssize_t
sc_usb_find_devices(struct sc_usb *usb, const char *serial, sc_usb_find_devices(struct sc_usb *usb, const char *serial,
struct sc_usb_device *devices, size_t len) { struct sc_usb_device *devices, size_t len) {
assert(serial);
libusb_device **list; libusb_device **list;
ssize_t count = libusb_get_device_list(usb->context, &list); ssize_t count = libusb_get_device_list(usb->context, &list);
if (count < 0) { if (count < 0) {