Clean up delay functions#1766
Merged
Merged
Conversation
This file contains hidden or 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
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.
We had a rather scattered selection of delay functions being used:
delaysimply took a number of loop iterations, for a C loop with anopin it. Analysis of this loop as compiled by GCC 15.2 shows it currently takes 7 cycles per iteration on the M4. This function has been removed, and all uses of it have been replaced with calls todelay_usordelay_msaccording to either apparent intent, or actual effect, at each call site.delaymsinrad1o/display.c, which builds ondelaybut "naively assumes 204 MHz instruction cycle clock and five instructions per count" (wrong, though might have been right on earlier compilers). Replaced withdelay_ms.portapack_sleep_milliseconds, which did the same. Replaced withdelay_ms.delay_us_at_mhz, which I added to provide an actually-calibrated loop, but which requires knowing the current CPU clock speed. Replaced withdelay_us, which usesdelay_us_at_mhzinternally, but with the clock speed parameter provided by the newcpu_clock_mhzsymbol, updated by code incpu_clockwhen making changes.halt_and_flashpassed its argument todelay. Replaced that call withdelay_ms, and updated arguments tohalt_and_flashaccordingly.