Skip to content

Allow the taken flag to be optimized out #243

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

Merged
merged 1 commit into from
Jul 12, 2020
Merged

Allow the taken flag to be optimized out #243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/peripheral/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,17 @@ pub struct Peripherals {
// NOTE `no_mangle` is used here to prevent linking different minor versions of this crate as that
// would let you `take` the core peripherals more than once (one per minor version)
#[no_mangle]
static mut CORE_PERIPHERALS: bool = false;
static CORE_PERIPHERALS: () = ();

/// Set to `true` when `take` or `steal` was called to make `Peripherals` a singleton.
static mut TAKEN: bool = false;

impl Peripherals {
/// Returns all the core peripherals *once*
#[inline]
pub fn take() -> Option<Self> {
interrupt::free(|_| {
if unsafe { CORE_PERIPHERALS } {
if unsafe { TAKEN } {
None
} else {
Some(unsafe { Peripherals::steal() })
Expand All @@ -168,7 +171,7 @@ impl Peripherals {
/// Unchecked version of `Peripherals::take`
#[inline]
pub unsafe fn steal() -> Self {
CORE_PERIPHERALS = true;
TAKEN = true;

Peripherals {
CBP: CBP {
Expand Down