usb: dfu: refactor dfu class implementation #30611
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
December 10, 2020 12:08
In accordance with USB DFU 1.1 Section 5.1, a device should only stay in appDETACH for a given period of time, either from the DFU_DETACH request (wValue ms) or from the wDetachTimeout property, after which the device should return to appIDLE. Signed-off-by: Michael Rosen <[email protected]>
The USB device descriptors for DFU mode should only change after a USB reset, not in appDETACH as the device is still in run-time mode until reset; thus should still return the run-time descriptors when requested. Signed-off-by: Michael Rosen <[email protected]>
|
@jfischer-no There was a bit of open discussion about the new VID/PID, I did a bit of what you had suggested as part of these commits but Im not sure we reached a final conclusion on whether there should be a separate VID, and what if anything cmake for DFU should check; since this is probably the most important fix in this commit due to it causing the most issues (again, Windows 10, dfu-utl 0.9 will always fail any DFU transaction the first time due to descriptor caching) |
jfischer-no
requested changes
Dec 10, 2020
subsys/usb/class/dfu/CMakeLists.txt
Outdated
|
|
||
| zephyr_sources(usb_dfu.c) | ||
|
|
||
| if(CONFIG_USB_DEVICE_VID EQUAL CONFIG_USB_DEVICE_DFU_VID) |
There was a problem hiding this comment.
Please remove everything about USB_DEVICE_DFU_VID, it is not necessary to change VID.
mrrosen
force-pushed
the
usb-dfu-fixes
branch
from
4ad011e
to
d36277e
Compare
Refactor the file structure for USB DFU class to facilitate separate PID for USB DFU when in DFU mode. As required by USB DFU 1.1 Section 2, the PID in the USB device descriptor must be different between the Run-time and DFU mode device descriptor to avoid problems caused by the host OS caching the remaining descriptors when switching to DFU mode, thus hiding the new interface descriptors from applications on the host and reporting the Run-time descriptors when the device is in DFU mode. To avoid adding too much clutter to the root USB class Kconfig and CMakeLists files, move the DFU class files into their own directory with dedicated Kconfig and CMakeLists.txt. Signed-off-by: Michael Rosen <[email protected]>
mrrosen
force-pushed
the
usb-dfu-fixes
branch
from
d36277e
to
0f0f53e
Compare
|
@jfischer-no Any other changes need to be made to this PR? |
jfischer-no
approved these changes
Dec 17, 2020
nvlsianpu
approved these changes
Dec 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
From #30562, some smaller fixes for USB DFU class implementation were included in this PR that have been separated out in this PR as separate commits: