diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2022-08-12 00:34:12 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-08-12 00:34:12 +0000 |
| commit | 0e530549de322684c50e858c6bb985afb5479dbe (patch) | |
| tree | 21efc15cdadf74ac03a2e210f15eff1542f33e82 /src/peripheral/mod.rs | |
| parent | e46e2310adc86a5a09a1858a23ecdde2a2c6963f (diff) | |
| parent | 3a15a6b4b320fa328e8ab99c31f81536960dd280 (diff) | |
| download | cortex-m-0e530549de322684c50e858c6bb985afb5479dbe.tar.gz cortex-m-0e530549de322684c50e858c6bb985afb5479dbe.tar.zst cortex-m-0e530549de322684c50e858c6bb985afb5479dbe.zip | |
Merge #447
447: Add implementation for critical-section 1.0 r=adamgreig a=Dirbaio
Picking up #433 since it seems stalled. Changes from #433 are:
- Update to `critical-section 1.0.0-alpha.2`
- Use `bool` restore token
- Name Cargo feature `critical-section-single-core`.
TODO before merging:
- [x] Wait for `critical-section 1.0` release https://github.com/rust-embedded/critical-section/pull/19
Co-Authored-By: Markus Reiter `@reitermarkus`
Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Diffstat (limited to 'src/peripheral/mod.rs')
| -rw-r--r-- | src/peripheral/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/peripheral/mod.rs b/src/peripheral/mod.rs index c316886..bf18151 100644 --- a/src/peripheral/mod.rs +++ b/src/peripheral/mod.rs @@ -57,7 +57,6 @@ //! //! - ARMv7-M Architecture Reference Manual (Issue E.b) - Chapter B3 -use crate::interrupt; use core::marker::PhantomData; use core::ops; @@ -164,7 +163,7 @@ impl Peripherals { /// Returns all the core peripherals *once* #[inline] pub fn take() -> Option<Self> { - interrupt::free(|_| { + critical_section::with(|_| { if unsafe { TAKEN } { None } else { |