Mac: Update endpoints when interface alt setting is changed #50
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
The set of available endpoints can change when an interface's alt setting is changed, so on Mac we need to refresh our cached set of endpoints.
kevinmehall
reviewed
Apr 24, 2024
src/platform/macos_iokit/device.rs
Outdated
| let endpoints = self.interface.endpoints()?; | ||
| debug!("Found endpoints: {endpoints:?}"); | ||
|
|
||
| *self.endpoints.lock().unwrap() = endpoints; |
There was a problem hiding this comment.
Maybe this should take the lock before calling SetAlternateInterface and self.interface.endpoints() to ensure consistency if multiple threads call set_alt_setting concurrently.
Which would be a silly thing to do and I don't know how a caller could possibly know what endpoints to use afterward without doing their own synchronization, but if we have the Mutex here, might as well take full advantage of it.
src/platform/macos_iokit/device.rs
Outdated
| } | ||
|
|
||
| pub fn clear_halt(&self, endpoint: u8) -> Result<(), Error> { | ||
| debug!("Clear halt, endpoint {endpoint:02x}"); | ||
| let ep = self | ||
| .endpoints | ||
| let endpoints = self.endpoints.lock().unwrap(); |
There was a problem hiding this comment.
And this one should release the lock before the blocking call to ClearPipeStallBothEnds, to avoid blocking other endpoints from creating transfers while the call completes synchronously.
|
Thanks! |
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.
The set of available endpoints can change when an interface's alt setting is changed, so on Mac we need to refresh our cached set of endpoints.
This necessitates wrapping the
BTreeMapin aMutexso it can be updated through the sharedselfreference inset_alt_setting.I also changed
IoKitInterface::endpointsto take a&selfreference instead of&mut self. This seems sound from my inspection, but it should be reviewed carefully in case I missed something.