proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 10:09:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Use new API in libgusb to better detect USB replug

Browse Source
This commit is contained in:
Richard Hughes 2023-02-01 15:38:52 +00:00 committed by Mario Limonciello
parent 090a7c8b9a
commit 13af5989b2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fu-usb-backend.c
View File

@ -56,17 +56,21 @@ fu_usb_backend_device_added_cb(GUsbContext *ctx, GUsbDevice *usb_device, FuBacke
/* is emulated? */ /* is emulated? */
device_tmp = fu_backend_lookup_by_id(backend, g_usb_device_get_platform_id(usb_device)); device_tmp = fu_backend_lookup_by_id(backend, g_usb_device_get_platform_id(usb_device));
if (device_tmp != NULL && fu_device_has_flag(device_tmp, FWUPD_DEVICE_FLAG_EMULATED)) { if (device_tmp != NULL && fu_device_has_flag(device_tmp, FWUPD_DEVICE_FLAG_EMULATED)) {
if (g_usb_device_get_vid(usb_device) == GUsbDevice *usb_device_tmp = fu_usb_device_get_dev(FU_USB_DEVICE(device_tmp));
fu_usb_device_get_vid(FU_USB_DEVICE(device_tmp)) && #if G_USB_CHECK_VERSION(0, 4, 5)
g_usb_device_get_pid(usb_device) == if (g_date_time_equal(g_usb_device_get_created(usb_device),
fu_usb_device_get_pid(FU_USB_DEVICE(device_tmp))) { g_usb_device_get_created(usb_device_tmp))) {
#else
if (g_usb_device_get_vid(usb_device) == g_usb_device_get_vid(usb_device_tmp) &&
g_usb_device_get_pid(usb_device) == g_usb_device_get_pid(usb_device_tmp)) {
#endif
g_debug("replacing GUsbDevice of emulated device %s", g_debug("replacing GUsbDevice of emulated device %s",
fu_usb_device_get_platform_id(FU_USB_DEVICE(device_tmp))); fu_usb_device_get_platform_id(FU_USB_DEVICE(device_tmp)));
fu_usb_device_set_dev(FU_USB_DEVICE(device_tmp), usb_device); fu_usb_device_set_dev(FU_USB_DEVICE(device_tmp), usb_device);
fu_backend_device_changed(backend, device_tmp); fu_backend_device_changed(backend, device_tmp);
return; return;
} }
g_debug("delayed removal of emulated device as VID:PID changed"); g_debug("delayed removal as emulated device changed");
fu_backend_device_removed(backend, device_tmp); fu_backend_device_removed(backend, device_tmp);
} }