Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflict between RtcClock::get_xtal_freq and Rtc::disable_rom_message_printing #2360

Merged
merged 2 commits into from
Oct 22, 2024

Conversation

dimpolo
Copy link
Contributor

@dimpolo dimpolo commented Oct 16, 2024

First commit is just some deduplication and cleanup.

See also:
espressif/esp-idf@c7c2462

Tested on the ESP32S3

@@ -423,7 +425,7 @@ impl<'d> Rtc<'d> {
let rtc_cntl = unsafe { lp_aon() };
rtc_cntl
.store4()
.modify(|r, w| unsafe { w.bits(r.bits() | 1) });
.modify(|r, w| unsafe { w.bits(r.bits() | Self::RTC_DISABLE_ROM_LOG) });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might be better off adding this bit to the PAC, and that would also allow us to remove the masking of this bit in L508.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that these registers don't have actual functionality associated with them. Instead they're a way to pass data between the bootloaders and the application. Not sure if that's a PAC thing

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that's technically correct, but if we use this as something fixed-function, we might as well make our lives a bit easier :) Not sure what the team thinks, though, it's just my opinion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say it's just a register to store arbitrary data so probably it's better to keep it as is. esp-hal might not be the only consumer of the SVDs

Copy link
Contributor

@bugadani bugadani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, let's get this in before it starts collecting dust and merge conflicts.

Copy link
Contributor

@bjoernQ bjoernQ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bjoernQ bjoernQ added this pull request to the merge queue Oct 22, 2024
Merged via the queue into esp-rs:main with commit 62ee60d Oct 22, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants