audio: fix audiod_open with midi interfaces #3383
Merged
+29
−5
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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR enhances the audiod_open function in audio_device.c to properly differentiate between Audio and MIDI device interfaces, preventing the audio driver from incorrectly accepting MIDI devices. The fix adds validation logic to verify that the interface following an Audio Control interface is Audio Streaming (subclass 2) rather than MIDI Streaming (subclass 3).
Key changes:
- Added explicit return value
0to all TU_VERIFY and TU_ASSERT macro calls for consistent error handling - Implemented new validation block (lines 861-883) to check the second interface descriptor's subclass before accepting the device
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
This fix tested and worked for my problem in discussion: #3382 |
Signed-off-by: Zixun LI <[email protected]>
|
Collaborator
Author
|
@hathach could you pick this before 0.20.1 tag? |
|
There's a video here of me using this fix, along with MIDI And Vendor connections. |
Size Difference ReportBecause TinyUSB code size varies by port and configuration, the metrics below represent the averaged totals across all example builds. Note: If there is no change, only one value is shown. Changes >1% in size
Changes <1% in sizeNo entries. No changes
|
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.
This pull request improves the robustness of the audio device interface validation logic in
audio_device.cby adding extra checks to differentiate between Audio and MIDI interfaces.