proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 04:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dfu: Allow disabling a DFU device by setting the version to 0

Browse Source 
This would be used where the device matches the `USB\CLASS_FE&SUBCLASS_01`
instance ID, but wants to be handled in another plugin.
This commit is contained in:
Richard Hughes 2022-09-28 10:54:08 +01:00
parent d5585728a2
commit 09b37cecb0
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/dfu/README.md
View File

@ -49,6 +49,7 @@ Since: 1.0.1
### DfuForceVersion ### DfuForceVersion
Forces a specific DFU version for the hardware device. This is required if the device does not set, or sets incorrectly, items in the DFU functional descriptor. Forces a specific DFU version for the hardware device. This is required if the device does not set, or sets incorrectly, items in the DFU functional descriptor.
If set to 0000 then the DFU functionality is disabled.
Since: 1.0.1 Since: 1.0.1

19
plugins/dfu/fu-dfu-device.c
View File

@ -26,7 +26,7 @@
* *
* Forces a specific DFU version for the hardware device. This is required * Forces a specific DFU version for the hardware device. This is required
* if the device does not set, or sets incorrectly, items in the DFU functional * if the device does not set, or sets incorrectly, items in the DFU functional
* descriptor. * descriptor. If zero, then DFU functionality is disabled.
* *
* Since: 1.0.1 * Since: 1.0.1
*/ */
@ -86,7 +86,8 @@ fu_dfu_device_to_string(FuDevice *device, guint idt, GString *str)
if (priv->chip_id != NULL) if (priv->chip_id != NULL)
fu_string_append(str, idt, "ChipId", priv->chip_id); fu_string_append(str, idt, "ChipId", priv->chip_id);
fu_string_append_kx(str, idt, "Version", priv->version); fu_string_append_kx(str, idt, "Version", priv->version);
fu_string_append_kx(str, idt, "ForceVersion", priv->force_version); if (priv->force_version != G_MAXUINT16)
fu_string_append_kx(str, idt, "ForceVersion", priv->force_version);
if (priv->force_transfer_size != 0x0) { if (priv->force_transfer_size != 0x0) {
fu_string_append_kx(str, idt, "ForceTransferSize", priv->force_transfer_size); fu_string_append_kx(str, idt, "ForceTransferSize", priv->force_transfer_size);
} }
@ -258,6 +259,15 @@ fu_dfu_device_add_targets(FuDfuDevice *self, GError **error)
GUsbDevice *usb_device = fu_usb_device_get_dev(FU_USB_DEVICE(self)); GUsbDevice *usb_device = fu_usb_device_get_dev(FU_USB_DEVICE(self));
g_autoptr(GPtrArray) ifaces = NULL; g_autoptr(GPtrArray) ifaces = NULL;
/* disabled using quirk */
if (priv->force_version == 0x0) {
g_set_error_literal(error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED,
"ignoring device as DFU version set to 0x0");
return FALSE;
}
/* add all DFU-capable targets */ /* add all DFU-capable targets */
ifaces = g_usb_device_get_interfaces(usb_device, error); ifaces = g_usb_device_get_interfaces(usb_device, error);
if (ifaces == NULL) if (ifaces == NULL)
@ -296,7 +306,7 @@ fu_dfu_device_add_targets(FuDfuDevice *self, GError **error)
} }
/* fix up the version */ /* fix up the version */
if (priv->force_version > 0) if (priv->force_version != G_MAXUINT16)
priv->version = priv->force_version; priv->version = priv->force_version;
if (priv->version == FU_DFU_FIRMARE_VERSION_DFU_1_0 || if (priv->version == FU_DFU_FIRMARE_VERSION_DFU_1_0 ||
priv->version == FU_DFU_FIRMARE_VERSION_DFU_1_1) { priv->version == FU_DFU_FIRMARE_VERSION_DFU_1_1) {
@ -886,7 +896,7 @@ fu_dfu_device_detach(FuDevice *device, FuProgress *progress, GError **error)
} }
/* success */ /* success */
priv->force_version = 0x0; priv->force_version = G_MAXUINT16;
fu_device_add_flag(device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG); fu_device_add_flag(device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG);
return TRUE; return TRUE;
} }
@ -1688,6 +1698,7 @@ fu_dfu_device_init(FuDfuDevice *self)
priv->targets = g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref); priv->targets = g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref);
priv->timeout_ms = 1500; priv->timeout_ms = 1500;
priv->transfer_size = 64; priv->transfer_size = 64;
priv->force_version = G_MAXUINT16;
fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);
fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);