Fix mass-erase trigger on "small" devices. #210
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
The list of specifically enumerated "large" devices has the correct set of register operations to start a mass erase, setting the mer1 and mer2 bits. But the "small-devices" alternative does not; it clears the mer bit instead of setting it. Looking at history, this was changed from set to clear in the PR that added support for "large" devices. It appears to have been accidental.
|
The CI tests are failing due to the nightly compiler change to reject all references to mutable statics, not due to this change. |
eldruin
reviewed
Feb 8, 2024
This is mostly a workaround, because Pin<> requires a reference, not a pointer, but the rust compiler change wants users to use pointers (via addr_of_mut!()), not references. In this particular case, we don't actually *need* Pin<>, because the static mut won't be moved anyway, but we can't prove that to the DMA API without it. So deref the addr_of_mut!() pointer, and make a ref to it, rather than restructuring the DMA API to work on raw pointers (and somehow enforce the Pin<> guarantees on the pointed-to data).
Missed these in the previous commit because I did not test locally with the `rt` feature enabled.
Done.
Also done. 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 list of specifically enumerated "large" devices has the correct set of register operations to start a mass erase, setting the mer1 and mer2 bits. But the "small-devices" alternative does not; it clears the mer bit instead of setting it.
Looking at history, this was changed from set to clear in the PR that added support for "large" devices. It appears to have been accidental.