Skip to content

Fix interrupt::free. #433

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.

Sign up for GitHub

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

Closed
reitermarkus wants to merge 9 commits into from
Closed

Fix interrupt::free. #433

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d18397
Fix `interrupt::free`.
reitermarkus Apr 21, 2022
d77f65e
Don't pass `CriticalSection` in `interrupt::free`.
reitermarkus May 4, 2022
d2210f4
Add single-core implementation for `critical_section` crate.
reitermarkus May 4, 2022
ea80d60
Add changelog entry.
reitermarkus May 3, 2022
3ced1f2
Add patch note.
reitermarkus May 4, 2022
40b8352
Fix tests.
reitermarkus May 4, 2022
cfba329
Replace `interrupt::free` with `critical_section::with`.
reitermarkus May 5, 2022
4b01e89
Update `critical-section` crate.
reitermarkus May 8, 2022
183e7e8
Update `critical_section` dependency.
reitermarkus Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix interrupt::free.
  • Loading branch information
@reitermarkus
reitermarkus committed May 8, 2022
commit 6d18397d006ac321dee093f44568f245b479da9c
6 changes: 3 additions & 3 deletions src/interrupt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ pub unsafe fn enable() {
#[inline]
pub fn free<F, R>(f: F) -> R
where
F: FnOnce(&CriticalSection) -> R,
F: FnOnce(CriticalSection<'_>) -> R,
{
let primask = crate::register::primask::read();

// disable interrupts
disable();

let r = f(unsafe { &CriticalSection::new() });
let r = f(unsafe { CriticalSection::new() });

// If the interrupts were active before our `disable` call, then re-enable
// them. Otherwise, keep them disabled
Expand All @@ -85,7 +85,7 @@ where
#[inline]
pub fn free<F, R>(_: F) -> R
where
F: FnOnce(&CriticalSection) -> R,
F: FnOnce(CriticalSection<'_>) -> R,
{
panic!("cortex_m::interrupt::free() is only functional on cortex-m platforms");
}