alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-12-23 20:51:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #497 from jannic/dead-code-RpSpinlockCs

Browse source 
Avoid dead_code warning if critical-section-impl is not enabled
This commit is contained in:
Jan Niehusmann 2022-11-13 11:12:25 +01:00 committed by GitHub
parent 40f3f42c70 c1988432c8
commit f00ea66ccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rp2040-hal/src/critical_section_impl.rs
View file

@ -1,9 +1,7 @@
use core::sync::atomic::{AtomicU8, Ordering};
struct RpSpinlockCs;
#[cfg(feature = "critical-section-impl")]
critical_section_0_2::custom_impl!(RpSpinlockCs);
#[cfg(feature = "critical-section-impl")]
critical_section::set_impl!(RpSpinlockCs);
/// Marker value to indicate no-one has the lock.
@ -24,7 +22,6 @@ static LOCK_OWNER: AtomicU8 = AtomicU8::new(LOCK_UNOWNED);
/// The value 2 indicates that we aren't the outermost call, and should not release the spinlock or re-enable interrupts in `release`
const LOCK_ALREADY_OWNED: u8 = 2;
#[cfg(feature = "critical-section-impl")]
unsafe impl critical_section_0_2::Impl for RpSpinlockCs {
unsafe fn acquire() -> u8 {
RpSpinlockCs::acquire()
@ -35,7 +32,6 @@ unsafe impl critical_section_0_2::Impl for RpSpinlockCs {
}
}
#[cfg(feature = "critical-section-impl")]
unsafe impl critical_section::Impl for RpSpinlockCs {
unsafe fn acquire() -> u8 {
RpSpinlockCs::acquire()

1
rp2040-hal/src/lib.rs
View file

@ -19,6 +19,7 @@ mod intrinsics;
pub mod adc;
pub(crate) mod atomic_register_access;
pub mod clocks;
#[cfg(feature = "critical-section-impl")]
mod critical_section_impl;
pub mod dma;
mod float;

5
rp2040-hal/src/sio.rs
View file

@ -638,8 +638,13 @@ pub type Spinlock30 = Spinlock<30>;
impl SpinlockValid for Spinlock<30> {}
/// Spinlock number 31 - used by critical section implementation
#[cfg(feature = "critical-section-impl")]
pub(crate) type Spinlock31 = Spinlock<31>;
/// Spinlock number 31 - only public if critical-section-impl is not enabled
#[cfg(not(feature = "critical-section-impl"))]
pub type Spinlock31 = Spinlock<31>;
impl SpinlockValid for Spinlock<31> {}
/// Returns the current state of the spinlocks. Each index corresponds to the associated spinlock, e.g. if index `5` is set to `true`, it means that [`Spinlock5`] is currently locked.