Fix USB descriptors for multiple interface devices #3193
Merged
Conversation
This file contains hidden or 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
For simple 1-interface devices, there is a fixes position in the USB interface descriptor where the interface lives and we can hardcode an updater in the USB handler. However, for devices like CDC(Serial) or MIDI there are multiple interfaces and the interface IDs need to be stuffed inside the actrual descriptor. To allow this, instead of just taking a fixed set of bytes and blindly patching in USB, make all interfaces do their own memcpy from a local version, updated with the new dynamic interface id, via a callback. Add a simple USBClass callback to handle the normal 1-interface case. Fix MSD (SingleFileDrive, FatFSUSB) to only request the correct, single interface used.
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.
For simple 1-interface devices, there is a fixed position in the USB interface descriptor where the interface lives and we can hardcode an updater in the USB handler. However, for devices like CDC(Serial) or MIDI there are multiple interfaces and the interface IDs need to be stuffed inside the actual descriptor at different locations.
To allow this, instead of just taking a fixed set of bytes and blindly patching in USB, make all interfaces do their own memcpy from a local version, updated with the new dynamic interface id, via a callback.
Add a simple USBClass callback to handle the normal 1-interface case without add'l code.
Fix MSD (SingleFileDrive, FatFSUSB) to only request the correct, single interface used.