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

Expose function to find a USB device

Browse source 
The device was automatically found by sc_usb_connect(). Instead, expose
a function to find a device from a serial, and let the caller connect to
the device found (if any).

This will allow to list all devices first, then select one device to
connect to.

PR #2974 <https://github.com/Genymobile/scrcpy/pull/2974>
This commit is contained in:
Romain Vimont 2022-01-25 21:11:32 +01:00
parent 1ab3692f3d
commit 0ee9e2ff51
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/scrcpy.c
View file

@ -431,7 +431,17 @@ scrcpy(struct scrcpy_options *options) {
goto aoa_hid_end;
}
ok = sc_usb_connect(&s->usb, serial);
assert(serial);
libusb_device *device = sc_usb_find_device(&s->usb, serial);
if (!device) {
LOGE("Could not find USB device %s", serial);
sc_usb_destroy(&s->usb);
sc_acksync_destroy(&s->acksync);
goto aoa_hid_end;
}
ok = sc_usb_connect(&s->usb, device);
libusb_unref_device(device);
if (!ok) {
LOGE("Failed to connect to USB device %s", serial);
sc_usb_destroy(&s->usb);

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

@ -57,8 +57,10 @@ accept_device(libusb_device *device, const char *serial) {
return matches;
}
static libusb_device *
libusb_device *
sc_usb_find_device(struct sc_usb *usb, const char *serial) {
assert(serial);
libusb_device **list;
libusb_device *result = NULL;
ssize_t count = libusb_get_device_list(usb->context, &list);
@ -103,19 +105,9 @@ sc_usb_destroy(struct sc_usb *usb) {
}
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);
return false;
}
sc_usb_connect(struct sc_usb *usb, libusb_device *device) {
usb->handle = sc_usb_open_handle(device);
libusb_unref_device(device);
if (!usb->handle) {
LOGW("Could not open USB device %s", serial);
return false;
}

5
app/src/usb/usb.h
View file

@ -17,8 +17,11 @@ sc_usb_init(struct sc_usb *usb);
void
sc_usb_destroy(struct sc_usb *usb);
libusb_device *
sc_usb_find_device(struct sc_usb *usb, const char *serial);
bool
sc_usb_connect(struct sc_usb *usb, const char *serial);
sc_usb_connect(struct sc_usb *usb, libusb_device *device);
void
sc_usb_disconnect(struct sc_usb *usb);