Add support for 4-byte QSPI flash addressing #295
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
6 tasks
trabucayre
reviewed
Jan 21, 2023
src/spiFlash.cpp
Outdated
Comment on lines
122
to
141
| uint8_t tx[5]; | ||
| uint32_t len; | ||
|
|
||
| if (addr <= 0xffffff) { | ||
| tx[0] = static_cast<uint8_t>(FLASH_SE ); | ||
| tx[1] = static_cast<uint8_t>(0xff & (addr >> 16)); | ||
| tx[2] = static_cast<uint8_t>(0xff & (addr >> 8)); | ||
| tx[3] = static_cast<uint8_t>(0xff & (addr )); | ||
| len = 4; | ||
| } else { | ||
| tx[0] = static_cast<uint8_t>(FLASH_4SE ); | ||
| tx[1] = static_cast<uint8_t>(0xff & (addr >> 24)); | ||
| tx[2] = static_cast<uint8_t>(0xff & (addr >> 16)); | ||
| tx[3] = static_cast<uint8_t>(0xff & (addr >> 8)); | ||
| tx[4] = static_cast<uint8_t>(0xff & (addr )); | ||
| len = 5; | ||
| } | ||
|
|
||
| _spi->spi_put(tx, NULL, len); | ||
|
|
There was a problem hiding this comment.
It's looks good but too avoid to many dupplication maybe it's better to do something like (and of course same idea for next modifications):
uint8_t tx[5];
uint32_t len = 0;
uint8_t cmd = (addr <= 0xffffff) ? FLASH_SE : FLASH_4SE;
if (addr <= 0xffffff) {
tx[len++] = static_cast<uint8_t>(cmd );
if (cmd == FLASH_4SE)
tx[len++] = static_cast<uint8_t>(0xff & (addr >> 24));
tx[len++] = static_cast<uint8_t>(0xff & (addr >> 16));
tx[len++] = static_cast<uint8_t>(0xff & (addr >> 8));
tx[len++] = static_cast<uint8_t>(0xff & (addr ));
_spi->spi_put(tx, NULL, len);
There was a problem hiding this comment.
I completely agree. Please check the updated version.
To verify that this still works, I've cherry-picked this latest commit on top of my vcu118-flash branch and loaded/dumped a memory file that is larger than 16 MB.
|
Applied thanks @barbedo |
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.
Refer to #293.