aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob McWhirter <[email protected]>2021-07-14 14:37:42 -0400
committerBob McWhirter <[email protected]>2021-07-14 14:37:42 -0400
commit43cb8de4344cb8400632b125c2391d128090c86e (patch)
treeb2e40ae01571b5c8a64c50e0cbea878843151be8
parent38b1359c409e6bf285242561838d33e8c3c81927 (diff)
Remove gratuitous NoDmaMarker.
-rw-r--r--embassy-stm32/src/dma_traits.rs4
-rw-r--r--embassy-stm32/src/usart/v3.rs7
2 files changed, 2 insertions, 9 deletions
diff --git a/embassy-stm32/src/dma_traits.rs b/embassy-stm32/src/dma_traits.rs
index 518e10dcb..6733d911a 100644
--- a/embassy-stm32/src/dma_traits.rs
+++ b/embassy-stm32/src/dma_traits.rs
@@ -21,12 +21,8 @@ pub trait ReadDma<T> {
21 T: 'a; 21 T: 'a;
22} 22}
23 23
24pub trait NoDmaMarker {}
25
26pub struct NoDma; 24pub struct NoDma;
27 25
28impl NoDmaMarker for NoDma {}
29
30unsafe impl Unborrow for NoDma { 26unsafe impl Unborrow for NoDma {
31 type Target = NoDma; 27 type Target = NoDma;
32 28
diff --git a/embassy-stm32/src/usart/v3.rs b/embassy-stm32/src/usart/v3.rs
index 3029bf6e4..4d78abb24 100644
--- a/embassy-stm32/src/usart/v3.rs
+++ b/embassy-stm32/src/usart/v3.rs
@@ -10,7 +10,6 @@ use core::future::Future;
10use futures::TryFutureExt; 10use futures::TryFutureExt;
11 11
12use crate::dma_traits::NoDma; 12use crate::dma_traits::NoDma;
13use crate::dma_traits::NoDmaMarker;
14 13
15#[allow(dead_code)] 14#[allow(dead_code)]
16pub struct Uart<'d, T: Instance, TxDma = NoDma, RxDma = NoDma> { 15pub struct Uart<'d, T: Instance, TxDma = NoDma, RxDma = NoDma> {
@@ -114,10 +113,8 @@ impl<'d, T: Instance, TxDma, RxDma> Uart<'d, T, TxDma, RxDma> {
114 } 113 }
115} 114}
116 115
117impl<'d, T: Instance, TxDma, RxDma> embedded_hal::blocking::serial::Write<u8> 116impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
118 for Uart<'d, T, TxDma, RxDma> 117 for Uart<'d, T, NoDma, RxDma>
119where
120 TxDma: NoDmaMarker,
121{ 118{
122 type Error = Error; 119 type Error = Error;
123 fn bwrite_all(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { 120 fn bwrite_all(&mut self, buffer: &[u8]) -> Result<(), Self::Error> {