From 5981472a633b782ed21127ea9c63da8cc740a759 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 8 Jul 2022 12:26:12 +0100 Subject: [PATCH] dfu: Fix a regression for devices using the Atmel FLIP Bootloader This regressed in faa7871b081b0e5c4602fe0030d214215b6f4fdc as the ONLY_QUIRK vendor instance ID was no longer being added when the device switched into bootloader mode. We could add back the ->probe() to get the vendor quirk, but arguably the most sensible and correct thing to do is to just use the PID as well. There is only two PIDs we care about, and matching *every* device with the vendor ID is probably asking for trouble with other devices. --- plugins/dfu/dfu.quirk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/dfu/dfu.quirk b/plugins/dfu/dfu.quirk index 7738a941e..00dc133a9 100644 --- a/plugins/dfu/dfu.quirk +++ b/plugins/dfu/dfu.quirk @@ -99,15 +99,19 @@ Flags = no-pid-change,ignore-upload,attach-extra-reset [USB\VID_03EB&PID_2FF7] Plugin = dfu Flags = use-any-interface,legacy-protocol,force-dfu-mode +DfuForceVersion = ff01 [USB\VID_03EB&PID_2FF9] Plugin = dfu Flags = use-any-interface,legacy-protocol,force-dfu-mode +DfuForceVersion = ff01 [USB\VID_03EB&PID_2FFA] Plugin = dfu Flags = use-any-interface,legacy-protocol,force-dfu-mode +DfuForceVersion = ff01 [USB\VID_03EB&PID_2FFB] Plugin = dfu Flags = use-any-interface,legacy-protocol,force-dfu-mode +DfuForceVersion = ff01 # Atmel ATMEGA Bootloader [USB\VID_03EB&PID_2FEE] @@ -133,17 +137,13 @@ Flags = use-any-interface,legacy-protocol,force-dfu-mode [USB\VID_03EB&PID_2FE2] Plugin = dfu Flags = use-any-interface,force-dfu-mode +DfuForceVersion = ff01 # Leaflabs Maple3 [USB\VID_1EAF&PID_0003&REV_0200] Plugin = dfu DfuForceVersion = 0110 -# Atmel FLIP Bootloader -[USB\VID_03EB] -Plugin = dfu -DfuForceVersion = ff01 - # AT32UC3B1256 [BLDR][USER] USER@0x2000, BLDR+USER=0x40000 [DFU_AVR\CID_0x58200203] DfuAltName = @Flash/0x2000/1*248Kg