From 4fe318bd54716c24423a8e36b0ecc7fca786c2c1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 23 Apr 2021 19:29:51 +0100 Subject: [PATCH] dfu: Fix up some overzealous replacement when renaming the DFU files --- plugins/dfu/dfu.quirk | 4 ++-- plugins/dfu/fu-dfu-device.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/dfu/dfu.quirk b/plugins/dfu/dfu.quirk index e14ad931b..fba9788bf 100644 --- a/plugins/dfu/dfu.quirk +++ b/plugins/dfu/dfu.quirk @@ -20,7 +20,7 @@ Flags = detach-for-attach # Openmoko Freerunner / GTA02 [USB\VID_1D50&PID_5119] Plugin = dfu -Flags = ignore-polltimeout,no-pid-change,no-fu-dfu-runtime,needs-bootloader,no-get-status-upload +Flags = ignore-polltimeout,no-pid-change,no-dfu-runtime,needs-bootloader,no-get-status-upload # OpenPCD Reader [USB\VID_16C0&PID_076B] @@ -68,7 +68,7 @@ Flags = attach-upload-download # HydraBus [USB\VID_1D50&PID_60A7] Plugin = dfu -Flags = no-fu-dfu-runtime,needs-bootloader +Flags = no-dfu-runtime,needs-bootloader # Jabra 410 [appIDLE & dfuIDLE] [USB\VID_0B0E&PID_0411] diff --git a/plugins/dfu/fu-dfu-device.c b/plugins/dfu/fu-dfu-device.c index b76d6f36f..463339363 100644 --- a/plugins/dfu/fu-dfu-device.c +++ b/plugins/dfu/fu-dfu-device.c @@ -35,7 +35,7 @@ * * `ignore-polltimeout`: Ignore the device download timeout * * `ignore-runtime`: Device has broken DFU runtime support * * `ignore-upload`: Uploading from the device is broken - * * `no-fu-dfu-runtime`: No DFU runtime interface is provided + * * `no-dfu-runtime`: No DFU runtime interface is provided * * `no-get-status-upload`: Do not do GetStatus when uploading * * `no-pid-change`: Accept the same VID:PID when changing modes * * `use-any-interface`: Use any interface for DFU @@ -402,7 +402,7 @@ fu_dfu_device_add_targets (FuDfuDevice *self, GError **error) /* the device has no DFU runtime, so cheat */ if (priv->targets->len == 0 && - fu_device_has_custom_flag (FU_DEVICE (self), "no-fu-dfu-runtime")) { + fu_device_has_custom_flag (FU_DEVICE (self), "no-dfu-runtime")) { g_debug ("no DFU runtime, so faking device"); fu_dfu_device_set_state (self, FU_DFU_STATE_APP_IDLE); priv->iface_number = 0xff; @@ -871,7 +871,7 @@ fu_dfu_device_refresh (FuDfuDevice *self, GError **error) /* the device has no DFU runtime, so cheat */ if (priv->state == FU_DFU_STATE_APP_IDLE && - fu_device_has_custom_flag (FU_DEVICE (self), "no-fu-dfu-runtime")) + fu_device_has_custom_flag (FU_DEVICE (self), "no-dfu-runtime")) return TRUE; /* ensure interface is claimed */ @@ -1019,7 +1019,7 @@ fu_dfu_device_detach (FuDevice *device, GError **error) /* the device has no DFU runtime, so cheat */ if (priv->state == FU_DFU_STATE_APP_IDLE && - fu_device_has_custom_flag (FU_DEVICE (self), "no-fu-dfu-runtime")) + fu_device_has_custom_flag (FU_DEVICE (self), "no-dfu-runtime")) return TRUE; /* ensure interface is claimed */ @@ -1076,7 +1076,7 @@ fu_dfu_device_abort (FuDfuDevice *self, GError **error) /* the device has no DFU runtime, so cheat */ if (priv->state == FU_DFU_STATE_APP_IDLE && - fu_device_has_custom_flag (FU_DEVICE (self), "no-fu-dfu-runtime")) { + fu_device_has_custom_flag (FU_DEVICE (self), "no-dfu-runtime")) { g_set_error_literal (error, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED, @@ -1143,7 +1143,7 @@ fu_dfu_device_clear_status (FuDfuDevice *self, GError **error) /* the device has no DFU runtime, so cheat */ if (priv->state == FU_DFU_STATE_APP_IDLE && - fu_device_has_custom_flag (FU_DEVICE (self), "no-fu-dfu-runtime")) { + fu_device_has_custom_flag (FU_DEVICE (self), "no-dfu-runtime")) { g_set_error_literal (error, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED, @@ -1217,7 +1217,7 @@ fu_dfu_device_open (FuDevice *device, GError **error) /* the device has no DFU runtime, so cheat */ if (priv->state == FU_DFU_STATE_APP_IDLE && - fu_device_has_custom_flag (device, "no-fu-dfu-runtime")) { + fu_device_has_custom_flag (device, "no-dfu-runtime")) { fu_dfu_device_set_state (self, FU_DFU_STATE_APP_IDLE); priv->status = FU_DFU_STATUS_OK; }