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

e-h-bus: Adding AtomicDevice for I2C and SPI bus sharing in multiple interrupt contexts #579

Closed
1 change: 1 addition & 0 deletions embedded-hal-bus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ embedded-hal = { version = "1.0.0", path = "../embedded-hal" }
embedded-hal-async = { version = "1.0.0", path = "../embedded-hal-async", optional = true }
critical-section = { version = "1.0" }
defmt-03 = { package = "defmt", version = "0.3", optional = true }
portable-atomic = {version = "1", default-features = false}

[package.metadata.docs.rs]
features = ["std", "async"]
Expand Down
170 changes: 170 additions & 0 deletions embedded-hal-bus/src/i2c/atomic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
use core::cell::UnsafeCell;
use embedded_hal::i2c::{Error, ErrorKind, ErrorType, I2c};

/// `UnsafeCell`-based shared bus [`I2c`] implementation.
///
/// Sharing is implemented with a `UnsafeCell`. This means it has low overhead, similar to [`crate::i2c::RefCellDevice`] instances, but they are `Send`.
/// so it only allows sharing across multiple threads (interrupt priority levels). When attempting
/// to preempt usage of the bus, a `AtomicError::Busy` error is returned.
///
/// This primitive is particularly well-suited for applications that have external arbitration
/// rules, such as the RTIC framework.
///
/// # Examples
///
/// Assuming there is a pressure sensor with address `0x42` on the same bus as a temperature sensor
/// with address `0x20`; [`AtomicDevice`] can be used to give access to both of these sensors
/// from a single `i2c` instance.
///
/// ```
/// use embedded_hal_bus::i2c;
/// use core::cell::UnsafeCell;
/// # use embedded_hal::i2c::{self as hali2c, SevenBitAddress, TenBitAddress, I2c, Operation, ErrorKind};
/// # pub struct Sensor<I2C> {
/// # i2c: I2C,
/// # address: u8,
/// # }
/// # impl<I2C: I2c> Sensor<I2C> {
/// # pub fn new(i2c: I2C, address: u8) -> Self {
/// # Self { i2c, address }
/// # }
/// # }
/// # type PressureSensor<I2C> = Sensor<I2C>;
/// # type TemperatureSensor<I2C> = Sensor<I2C>;
/// # pub struct I2c0;
/// # #[derive(Debug, Copy, Clone, Eq, PartialEq)]
/// # pub enum Error { }
/// # impl hali2c::Error for Error {
/// # fn kind(&self) -> hali2c::ErrorKind {
/// # ErrorKind::Other
/// # }
/// # }
/// # impl hali2c::ErrorType for I2c0 {
/// # type Error = Error;
/// # }
/// # impl I2c<SevenBitAddress> for I2c0 {
/// # fn transaction(&mut self, address: u8, operations: &mut [Operation<'_>]) -> Result<(), Self::Error> {
/// # Ok(())
/// # }
/// # }
/// # struct Hal;
/// # impl Hal {
/// # fn i2c(&self) -> I2c0 {
/// # I2c0
/// # }
/// # }
/// # let hal = Hal;
///
/// let i2c = hal.i2c();
/// let i2c_unsafe_cell = UnsafeCell::new(i2c);
/// let mut temperature_sensor = TemperatureSensor::new(
/// i2c::AtomicDevice::new(&i2c_unsafe_cell),
/// 0x20,
/// );
/// let mut pressure_sensor = PressureSensor::new(
/// i2c::AtomicDevice::new(&i2c_unsafe_cell),
/// 0x42,
/// );
/// ```
pub struct AtomicDevice<'a, T> {
bus: &'a UnsafeCell<T>,
busy: portable_atomic::AtomicBool,
}

#[derive(Debug, Copy, Clone)]
/// Wrapper type for errors originating from the atomically-checked I2C bus manager.
pub enum AtomicError<T: Error> {
/// This error is returned if the I2C bus was already in use when an operation was attempted,
/// which indicates that the driver requirements are not being met with regard to
/// synchronization.
Busy,

/// An I2C-related error occurred, and the internal error should be inspected.
Other(T),
}

impl<T: Error> Error for AtomicError<T> {
fn kind(&self) -> ErrorKind {
match self {
AtomicError::Other(e) => e.kind(),
_ => ErrorKind::Other,
}
}
}

unsafe impl<'a, T> Send for AtomicDevice<'a, T> {}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would expect this to be impl Sync, but for some reason if I only do Sync, my test application complains that the AtomicDevice cannot be shared across threads safely.


impl<'a, T> AtomicDevice<'a, T>
where
T: I2c,
{
/// Create a new `AtomicDevice`.
#[inline]
pub fn new(bus: &'a UnsafeCell<T>) -> Self {
Self {
bus,
busy: portable_atomic::AtomicBool::from(false),
}
}

fn lock<R, F>(&self, f: F) -> Result<R, AtomicError<T::Error>>
where
F: FnOnce(&mut T) -> Result<R, <T as ErrorType>::Error>,
{
self.busy
.compare_exchange(
false,
true,
core::sync::atomic::Ordering::SeqCst,
core::sync::atomic::Ordering::SeqCst,
)
.map_err(|_| AtomicError::<T::Error>::Busy)?;

let result = f(unsafe { &mut *self.bus.get() });

self.busy.store(false, core::sync::atomic::Ordering::SeqCst);

result.map_err(AtomicError::Other)
}
}

impl<'a, T> ErrorType for AtomicDevice<'a, T>
where
T: I2c,
{
type Error = AtomicError<T::Error>;
}

impl<'a, T> I2c for AtomicDevice<'a, T>
where
T: I2c,
{
#[inline]
fn read(&mut self, address: u8, read: &mut [u8]) -> Result<(), Self::Error> {
self.lock(|bus| bus.read(address, read))
}

#[inline]
fn write(&mut self, address: u8, write: &[u8]) -> Result<(), Self::Error> {
self.lock(|bus| bus.write(address, write))
}

#[inline]
fn write_read(
&mut self,
address: u8,
write: &[u8],
read: &mut [u8],
) -> Result<(), Self::Error> {
self.lock(|bus| bus.write_read(address, write, read))
}

#[inline]
fn transaction(
&mut self,
address: u8,
operations: &mut [embedded_hal::i2c::Operation<'_>],
) -> Result<(), Self::Error> {
self.lock(|bus| bus.transaction(address, operations))
}
}
2 changes: 2 additions & 0 deletions embedded-hal-bus/src/i2c/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ mod mutex;
pub use mutex::*;
mod critical_section;
pub use self::critical_section::*;
mod atomic;
pub use atomic::*;
Loading