refactor spi flash detection #2643
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
|
You are welcome to add an entry to the CHANGELOG.md as well |
iceman1001
reviewed
Nov 19, 2024
common_arm/flashmem.c
Outdated
| } else { | ||
| // 0x90 Manufacture ID / device ID | ||
| FlashSendByte(ID); | ||
| FlashSendByte(0x00); | ||
| FlashSendByte(0x00); | ||
| FlashSendByte(0x00); | ||
|
|
||
| result->manufacturer_id = (FlashSendByte(0xFF) & 0xFF); | ||
| result->device_id = (FlashSendLastByte(0xFF) & 0xFF); | ||
| result->mfr_id = (FlashSendByte(0xFF) & 0xFF); |
There was a problem hiding this comment.
This rename made it hard to understand. Please revert.
iceman1001
reviewed
Nov 19, 2024
common_arm/flashmem.c
Outdated
| { 0xEF, 0x12, 0x0000, 8, "W25*40BV" }, // 512k | ||
| { 0xEF, 0x13, 0x0000, 16, "W25*80BV" } // 1024k | ||
| }; | ||
| const spi_flash_t *spi_flash_p = SpiFlashTable; |
There was a problem hiding this comment.
If you move this table to the header file where you declare it, you can remove the extern reference to it.
Not sure why you complicate it with pointers. I would have a static extern for table_idx, and a "get_item" function.
There was a problem hiding this comment.
You are right.
Actually only the number of the 64k pages is needed outside of the flashmem.c file.
rework in progress...
Reverted 'mfr_id' to 'manufacturer_id' Moved devices table definition to flashmem.h Single global variable 'spi_flash_pages64k' The local structure holding the actual device data is used in firmware.c only difference in code: ``` text data bss dec hex filename 223189 138560 6067 367816 59cc8 ./armsrc/obj/fullimage.elf <-- c9e751d darkside: fix backdoor support 223437 138624 6075 368136 59e08 ./armsrc/obj/fullimage.elf <-- this commit ====================================== +248 +64 +8 +320 ```
|
Awesome! |
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.
spi_flash_datais a structure of the data, red from the flash IC*spi_flash_pis a pointer to the detected flash IC, points to the default '256k/4 pages/unknown' device