dfu: Fix a regression for devices using the Atmel FLIP Bootloader

This regressed in faa7871b08 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.
This commit is contained in:
Richard Hughes 2022-07-08 12:26:12 +01:00
parent c9a8c42aca
commit 5981472a63

View File

@ -99,15 +99,19 @@ Flags = no-pid-change,ignore-upload,attach-extra-reset
[USB\VID_03EB&PID_2FF7] [USB\VID_03EB&PID_2FF7]
Plugin = dfu Plugin = dfu
Flags = use-any-interface,legacy-protocol,force-dfu-mode Flags = use-any-interface,legacy-protocol,force-dfu-mode
DfuForceVersion = ff01
[USB\VID_03EB&PID_2FF9] [USB\VID_03EB&PID_2FF9]
Plugin = dfu Plugin = dfu
Flags = use-any-interface,legacy-protocol,force-dfu-mode Flags = use-any-interface,legacy-protocol,force-dfu-mode
DfuForceVersion = ff01
[USB\VID_03EB&PID_2FFA] [USB\VID_03EB&PID_2FFA]
Plugin = dfu Plugin = dfu
Flags = use-any-interface,legacy-protocol,force-dfu-mode Flags = use-any-interface,legacy-protocol,force-dfu-mode
DfuForceVersion = ff01
[USB\VID_03EB&PID_2FFB] [USB\VID_03EB&PID_2FFB]
Plugin = dfu Plugin = dfu
Flags = use-any-interface,legacy-protocol,force-dfu-mode Flags = use-any-interface,legacy-protocol,force-dfu-mode
DfuForceVersion = ff01
# Atmel ATMEGA Bootloader # Atmel ATMEGA Bootloader
[USB\VID_03EB&PID_2FEE] [USB\VID_03EB&PID_2FEE]
@ -133,17 +137,13 @@ Flags = use-any-interface,legacy-protocol,force-dfu-mode
[USB\VID_03EB&PID_2FE2] [USB\VID_03EB&PID_2FE2]
Plugin = dfu Plugin = dfu
Flags = use-any-interface,force-dfu-mode Flags = use-any-interface,force-dfu-mode
DfuForceVersion = ff01
# Leaflabs Maple3 # Leaflabs Maple3
[USB\VID_1EAF&PID_0003&REV_0200] [USB\VID_1EAF&PID_0003&REV_0200]
Plugin = dfu Plugin = dfu
DfuForceVersion = 0110 DfuForceVersion = 0110
# Atmel FLIP Bootloader
[USB\VID_03EB]
Plugin = dfu
DfuForceVersion = ff01
# AT32UC3B1256 [BLDR][USER] USER@0x2000, BLDR+USER=0x40000 # AT32UC3B1256 [BLDR][USER] USER@0x2000, BLDR+USER=0x40000
[DFU_AVR\CID_0x58200203] [DFU_AVR\CID_0x58200203]
DfuAltName = @Flash/0x2000/1*248Kg DfuAltName = @Flash/0x2000/1*248Kg