Merge pull request #779 from stm32-rs/more-clean

tx rx trait default impl

Author: burrbull

src/lib.rs

@@ -200,10 +200,25 @@ pub trait Listen {
 }
 
 pub trait Ptr {
+    /// RegisterBlock structure
     type RB;
+    /// Return the pointer to the register block
     fn ptr() -> *const Self::RB;
 }
 
 pub trait Steal {
+    /// Steal an instance of this peripheral
+    ///
+    /// # Safety
+    ///
+    /// Ensure that the new instance of the peripheral cannot be used in a way
+    /// that may race with any existing instances, for example by only
+    /// accessing read-only or write-only registers, or by consuming the
+    /// original peripheral and using critical sections to coordinate
+    /// access between multiple new instances.
+    ///
+    /// Additionally the HAL may rely on only one
+    /// peripheral instance existing to ensure memory safety; ensure
+    /// no stolen instances are passed to such software.
     unsafe fn steal() -> Self;
 }

src/serial.rs

@@ -210,7 +210,11 @@ pub trait SerialExt: Sized + Instance {
         clocks: &Clocks,
     ) -> Result<Tx<Self, WORD>, config::InvalidConfig>
     where
-        NoPin: Into<Self::Rx<PushPull>>;
+        NoPin: Into<Self::Rx<PushPull>>,
+    {
+        self.serial((tx_pin, NoPin::new()), config, clocks)
+            .map(|s| s.split().0)
+    }
 
     fn rx<WORD>(
         self,
@@ -219,7 +223,11 @@ pub trait SerialExt: Sized + Instance {
         clocks: &Clocks,
     ) -> Result<Rx<Self, WORD>, config::InvalidConfig>
     where
-        NoPin: Into<Self::Tx<PushPull>>;
+        NoPin: Into<Self::Tx<PushPull>>,
+    {
+        self.serial((NoPin::new(), rx_pin), config, clocks)
+            .map(|s| s.split().1)
+    }
 }
 
 impl<USART: Instance, WORD> Serial<USART, WORD> {
@@ -231,10 +239,7 @@ impl<USART: Instance, WORD> Serial<USART, WORD> {
         ),
         config: impl Into<config::Config>,
         clocks: &Clocks,
-    ) -> Result<Self, config::InvalidConfig>
-    where
-        <USART as crate::Ptr>::RB: uart_impls::RegisterBlockImpl,
-    {
+    ) -> Result<Self, config::InvalidConfig> {
         <USART as crate::Ptr>::RB::new(usart, pins, config, clocks)
     }
 }

src/serial/hal_1.rs

@@ -89,8 +89,6 @@ mod nb {
 }
 
 mod io {
-    use core::ops::Deref;
-
     use super::super::{Error, Instance, RegisterBlockImpl, Rx, Serial, Tx};
     use embedded_io::Write;
 
@@ -113,11 +111,7 @@ mod io {
         type Error = Error;
     }
 
-    impl<USART: Instance> Write for Tx<USART, u8>
-    where
-        <USART as crate::Ptr>::RB: RegisterBlockImpl,
-        USART: Deref<Target = <USART as crate::Ptr>::RB>,
-    {
+    impl<USART: Instance> Write for Tx<USART, u8> {
         fn write(&mut self, bytes: &[u8]) -> Result<usize, Self::Error> {
             let mut i = 0;
             for byte in bytes.iter() {

src/serial/uart_impls.rs

@@ -650,28 +650,6 @@ impl<UART: Instance> SerialExt for UART {
     ) -> Result<Serial<Self, WORD>, config::InvalidConfig> {
         Serial::new(self, pins, config, clocks)
     }
-    fn tx<WORD>(
-        self,
-        tx_pin: impl Into<Self::Tx<PushPull>>,
-        config: impl Into<config::Config>,
-        clocks: &Clocks,
-    ) -> Result<Tx<Self, WORD>, config::InvalidConfig>
-    where
-        NoPin: Into<Self::Rx<PushPull>>,
-    {
-        Serial::tx(self, tx_pin, config, clocks)
-    }
-    fn rx<WORD>(
-        self,
-        rx_pin: impl Into<Self::Rx<PushPull>>,
-        config: impl Into<config::Config>,
-        clocks: &Clocks,
-    ) -> Result<Rx<Self, WORD>, config::InvalidConfig>
-    where
-        NoPin: Into<Self::Tx<PushPull>>,
-    {
-        Serial::rx(self, rx_pin, config, clocks)
-    }
 }
 
 impl<UART: Instance, WORD> Serial<UART, WORD> {