NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #1012

Browse source 
1012: rp i2c: have separate wakers for each i2c unit r=Dirbaio a=jsgf

If they both share one waker, there's the possibility that some wakeups could get lost.

Co-authored-by: Jeremy Fitzhardinge <jeremy@goop.org>
This commit is contained in:
bors[bot] 2022-10-18 08:29:43 +00:00 committed by GitHub
commit 18453ee64c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
embassy-rp/src/i2c.rs
View file

@ -70,8 +70,6 @@ impl<'d, T: Instance> I2c<'d, T, Blocking> {
} }
} }
static I2C_WAKER: AtomicWaker = AtomicWaker::new();
impl<'d, T: Instance> I2c<'d, T, Async> { impl<'d, T: Instance> I2c<'d, T, Async> {
pub fn new_async( pub fn new_async(
peri: impl Peripheral<P = T> + 'd, peri: impl Peripheral<P = T> + 'd,
@ -109,7 +107,7 @@ impl<'d, T: Instance> I2c<'d, T, Async> {
let r = f(self); let r = f(self);
if r.is_pending() { if r.is_pending() {
I2C_WAKER.register(cx.waker()); T::waker().register(cx.waker());
g(self); g(self);
} }
r r
@ -122,7 +120,7 @@ impl<'d, T: Instance> I2c<'d, T, Async> {
let i2c = T::regs(); let i2c = T::regs();
i2c.ic_intr_mask().write_value(pac::i2c::regs::IcIntrMask::default()); i2c.ic_intr_mask().write_value(pac::i2c::regs::IcIntrMask::default());
I2C_WAKER.wake(); T::waker().wake();
} }
async fn read_async_internal(&mut self, buffer: &mut [u8], restart: bool, send_stop: bool) -> Result<(), Error> { async fn read_async_internal(&mut self, buffer: &mut [u8], restart: bool, send_stop: bool) -> Result<(), Error> {
@ -809,6 +807,7 @@ fn i2c_reserved_addr(addr: u16) -> bool {
mod sealed { mod sealed {
use embassy_cortex_m::interrupt::Interrupt; use embassy_cortex_m::interrupt::Interrupt;
use embassy_sync::waitqueue::AtomicWaker;
pub trait Instance { pub trait Instance {
const TX_DREQ: u8; const TX_DREQ: u8;
@ -818,6 +817,7 @@ mod sealed {
fn regs() -> crate::pac::i2c::I2c; fn regs() -> crate::pac::i2c::I2c;
fn reset() -> crate::pac::resets::regs::Peripherals; fn reset() -> crate::pac::resets::regs::Peripherals;
fn waker() -> &'static AtomicWaker;
} }
pub trait Mode {} pub trait Mode {}
@ -862,6 +862,13 @@ macro_rules! impl_instance {
ret.$reset(true); ret.$reset(true);
ret ret
} }
#[inline]
fn waker() -> &'static AtomicWaker {
static WAKER: AtomicWaker = AtomicWaker::new();
&WAKER
}
} }
impl Instance for peripherals::$type {} impl Instance for peripherals::$type {}
}; };