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

use transfer_complete_flag; make partially generic

Browse source
This commit is contained in:
xoviat 2020-12-31 15:58:35 -06:00
parent 43904e8db0
commit d52e1b2276
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
embassy-stm32f4/src/serial.rs
View file

@ -20,6 +20,7 @@ use embedded_dma::{StaticReadBuffer, StaticWriteBuffer, WriteBuffer};
use crate::fmt::assert; use crate::fmt::assert;
use crate::hal::dma::config::DmaConfig; use crate::hal::dma::config::DmaConfig;
use crate::hal::dma::traits::{PeriAddress, Stream};
use crate::hal::dma::{ use crate::hal::dma::{
Channel4, Channel7, MemoryToPeripheral, PeripheralToMemory, Stream2, Stream7, StreamsTuple, Channel4, Channel7, MemoryToPeripheral, PeripheralToMemory, Stream2, Stream7, StreamsTuple,
Transfer, Transfer,
@ -161,7 +162,10 @@ impl Uarte {
/// `rx_buffer` is marked as static as per `embedded-dma` requirements. /// `rx_buffer` is marked as static as per `embedded-dma` requirements.
/// It it safe to use a buffer with a non static lifetime if memory is not /// It it safe to use a buffer with a non static lifetime if memory is not
/// reused until the future has finished. /// reused until the future has finished.
pub fn receive<'a, B>(&'a mut self, rx_buffer: B) -> ReceiveFuture<'a, B> pub fn receive<'a, B>(
&'a mut self,
rx_buffer: B,
) -> ReceiveFuture<'a, B, Stream2<DMA2>, Channel4>
where where
B: WriteBuffer<Word = u8> + 'static, B: WriteBuffer<Word = u8> + 'static,
{ {
@ -208,7 +212,7 @@ where
fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> { fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
let Self { uarte, tx_transfer } = unsafe { self.get_unchecked_mut() }; let Self { uarte, tx_transfer } = unsafe { self.get_unchecked_mut() };
let mut taken = tx_transfer.take().unwrap(); let mut taken = tx_transfer.take().unwrap();
if taken.is_done() { if Stream7::<DMA2>::get_transfer_complete_flag() {
let (tx_stream, usart, buf, _) = taken.free(); let (tx_stream, usart, buf, _) = taken.free();
uarte.tx_stream.replace(tx_stream); uarte.tx_stream.replace(tx_stream);
@ -226,19 +230,24 @@ where
} }
/// Future for the [`Uarte::receive()`] method. /// Future for the [`Uarte::receive()`] method.
pub struct ReceiveFuture<'a, B: WriteBuffer<Word = u8> + 'static> { pub struct ReceiveFuture<'a, B: WriteBuffer<Word = u8> + 'static, STREAM: Stream, CHANNEL> {
uarte: &'a mut Uarte, uarte: &'a mut Uarte,
rx_transfer: Option<Transfer<Stream2<DMA2>, Channel4, USART1, PeripheralToMemory, B>>, rx_transfer: Option<Transfer<STREAM, CHANNEL, USART1, PeripheralToMemory, B>>,
} }
impl<'a, B> Drop for ReceiveFuture<'a, B> // pub struct ReceiveFuture<'a, B: WriteBuffer<Word = u8> + 'static, DMA, STREAM, CHANNEL> {
where // uarte: &'a mut Uarte,
B: WriteBuffer<Word = u8> + 'static, // rx_transfer: Option<Transfer<Stream2<DMA2>, Channel4, USART1, PeripheralToMemory, B>>,
{ // }
fn drop(self: &mut Self) {}
}
impl<'a, B> Future for ReceiveFuture<'a, B> // impl<'a, B> Drop for ReceiveFuture<'a, B, USART1, Stream7<DMA2>, Channel4>
// where
// B: WriteBuffer<Word = u8> + 'static,
// {
// fn drop(self: &mut Self) {}
// }
impl<'a, B> Future for ReceiveFuture<'a, B, Stream2<DMA2>, Channel4>
where where
B: WriteBuffer<Word = u8> + 'static + Unpin, B: WriteBuffer<Word = u8> + 'static + Unpin,
{ {
@ -247,7 +256,8 @@ where
fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<B> { fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<B> {
let Self { uarte, rx_transfer } = unsafe { self.get_unchecked_mut() }; let Self { uarte, rx_transfer } = unsafe { self.get_unchecked_mut() };
let mut taken = rx_transfer.take().unwrap(); let mut taken = rx_transfer.take().unwrap();
if taken.is_done() {
if Stream7::<DMA2>::get_transfer_complete_flag() {
let (rx_stream, usart, buf, _) = rx_transfer.take().unwrap().free(); let (rx_stream, usart, buf, _) = rx_transfer.take().unwrap().free();
uarte.rx_stream.replace(rx_stream); uarte.rx_stream.replace(rx_stream);