Process out-of-order vfs sectors for Universal Hex in block format #1092
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
When blocks are received out of order the data passed to board_detect_incompatible_image() via flash_decoder_validate_target_image() might not be the first block of flash data, as expected by the microbitv2 imcompatibility detection, so pass the address to the function and perform the check.
When Universalh Hex was created two formats where specified, the segment format, which is currently used due to faster parsing, and the block format. The block format was design so that each 512-bytes of hex characters contain enough info to be self contained, however it was never tested in a systen that sent blocks out-of-order. The original vfs_manager expects all file blocks to arrive sequentially in order. This update adds a check of "self contained blocks" and a sticky flag that process these blocks whatever order they arrive and ignores all other non-self-contained vfs sectors received.
This frees up about 168 bytes with 10.3.1, which is needed to fit more features in some bootladers that were alredy at the .text limit.
|
The CI was failing because the So I've merged PR #1097 here to save enough flash to get these to builds successfully again. I don't mind if we merge it all together in this PR, or merge PR #1097 first and then I rebase this PR afterwards, either way works for me. |
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.
Tested in a VM with macOS 13.1, which had the issue where files larger than 1 MB would be sent out-of-order:
13.0 also had an issue where the OS was trying to read back some metadata files it was writtin to the MICROBIT drive, and that caused issues when DAPLink sent back zeros. That metadata issue was fixed in 13.1, but the out-of-order was still present until 13.2, so 13.1 is the best version to test this.