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

Add finish_dma function

Browse source
This commit is contained in:
Grant Miller 2021-12-14 16:59:31 -06:00
parent a13a7a6616
commit 6597e67036
4 changed files with 33 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
embassy-stm32/src/spi/mod.rs
View file

@ -451,6 +451,27 @@ fn spin_until_idle(regs: Regs) {
} }
} }
fn finish_dma(regs: Regs) {
spin_until_idle(regs);
unsafe {
regs.cr1().modify(|w| {
w.set_spe(false);
});
#[cfg(not(spi_v3))]
regs.cr2().modify(|reg| {
reg.set_txdmaen(false);
reg.set_rxdmaen(false);
});
#[cfg(spi_v3)]
regs.cfg1().modify(|reg| {
reg.set_txdmaen(false);
reg.set_rxdmaen(false);
});
}
}
trait Word { trait Word {
const WORDSIZE: WordSize; const WORDSIZE: WordSize;
} }

27
embassy-stm32/src/spi/v1.rs
View file

@ -32,6 +32,9 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
} }
f.await; f.await;
finish_dma(T::regs());
Ok(()) Ok(())
} }
@ -78,17 +81,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cr2().modify(|reg| {
reg.set_txdmaen(false);
reg.set_rxdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }
@ -138,17 +131,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cr2().modify(|reg| {
reg.set_txdmaen(false);
reg.set_rxdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }

34
embassy-stm32/src/spi/v2.rs
View file

@ -37,16 +37,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
f.await; f.await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cr2().modify(|reg| {
reg.set_txdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }
@ -93,17 +85,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cr2().modify(|reg| {
reg.set_txdmaen(false);
reg.set_rxdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }
@ -158,17 +140,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cr2().modify(|reg| {
reg.set_txdmaen(false);
reg.set_rxdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }

32
embassy-stm32/src/spi/v3.rs
View file

@ -39,14 +39,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
} }
f.await; f.await;
unsafe {
T::regs().cfg1().modify(|reg| { finish_dma(T::regs());
reg.set_txdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }
@ -97,17 +91,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cfg1().modify(|reg| {
reg.set_rxdmaen(false);
reg.set_txdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }
@ -164,17 +149,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
spin_until_idle(T::regs()); finish_dma(T::regs());
unsafe {
T::regs().cfg1().modify(|reg| {
reg.set_rxdmaen(false);
reg.set_txdmaen(false);
});
T::regs().cr1().modify(|w| {
w.set_spe(false);
});
}
Ok(()) Ok(())
} }
} }