max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #341 from lulf/usart-dma-read

Browse Source 
Add uart::Read DMA-based implementation
This commit is contained in:
Dario Nieuwenhuis
2021-08-04 11:02:15 +02:00
committed by GitHub
parent c52ef23280 0d02342b2d
commit 5d31dd328f
6 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
embassy-stm32/src/usart/v1.rs
View File

@ -80,7 +80,23 @@ impl<'d, T: Instance, TxDma, RxDma> Uart<'d, T, TxDma, RxDma> {
Ok(())
}
pub fn read(&mut self, buffer: &mut [u8]) -> Result<(), Error> {
async fn read_dma(&mut self, buffer: &mut [u8]) -> Result<(), Error>
where
RxDma: crate::usart::RxDma<T>,
{
let ch = &mut self.rx_dma;
unsafe {
self.inner.regs().cr3().modify(|reg| {
reg.set_dmar(true);
});
}
let r = self.inner.regs();
let src = r.dr().ptr() as *mut u8;
ch.read(ch.request(), src, buffer).await;
Ok(())
}
pub fn read_blocking(&mut self, buffer: &mut [u8]) -> Result<(), Error> {
unsafe {
let r = self.inner.regs();
for b in buffer {
@ -143,3 +159,15 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T,
self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
}
}
// rustfmt::skip because intellij removes the 'where' claus on the associated type.
#[rustfmt::skip]
impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma>
where RxDma: crate::usart::RxDma<T>
{
type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>;
fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
}
}

30
embassy-stm32/src/usart/v2.rs
View File

@ -84,7 +84,23 @@ impl<'d, T: Instance, TxDma, RxDma> Uart<'d, T, TxDma, RxDma> {
Ok(())
}
pub fn read(&mut self, buffer: &mut [u8]) -> Result<(), Error> {
async fn read_dma(&mut self, buffer: &mut [u8]) -> Result<(), Error>
where
RxDma: crate::usart::RxDma<T>,
{
let ch = &mut self.rx_dma;
unsafe {
self.inner.regs().cr3().modify(|reg| {
reg.set_dmar(true);
});
}
let r = self.inner.regs();
let src = r.rdr().ptr() as *mut u8;
ch.read(ch.request(), src, buffer).await;
Ok(())
}
pub fn read_blocking(&mut self, buffer: &mut [u8]) -> Result<(), Error> {
unsafe {
let r = self.inner.regs();
for b in buffer {
@ -147,3 +163,15 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T,
self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
}
}
// rustfmt::skip because intellij removes the 'where' claus on the associated type.
#[rustfmt::skip]
impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma>
where RxDma: crate::usart::RxDma<T>
{
type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>;
fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
}
}