config

Author: burrbull

src/serial/usart.rs

@@ -123,17 +123,17 @@ pub struct NoDMA;
 #[derive(Debug)]
 pub struct DMA;
 
-pub trait SerialExt<USART, Config> {
+pub trait SerialExt<Config>: Sized {
     fn usart<TX, RX>(
         self,
         tx: TX,
         rx: RX,
-        config: Config,
+        config: impl Into<Config>,
         rcc: &mut Rcc,
-    ) -> Result<Serial<USART, TX, RX>, InvalidConfig>
+    ) -> Result<Serial<Self, TX, RX>, InvalidConfig>
     where
-        TX: TxPin<USART>,
-        RX: RxPin<USART>;
+        TX: TxPin<Self>,
+        RX: RxPin<Self>;
 }
 
 impl<USART, TX, RX> fmt::Write for Serial<USART, TX, RX>
@@ -526,17 +526,17 @@ macro_rules! uart_lp {
     ($USARTX:ident,
         $usartX:ident, $clk_mul:expr
     ) => {
-        impl SerialExt<$USARTX, LowPowerConfig> for $USARTX {
+        impl SerialExt<LowPowerConfig> for $USARTX {
             fn usart<TX, RX>(
                 self,
                 tx: TX,
                 rx: RX,
-                config: LowPowerConfig,
+                config: impl Into<LowPowerConfig>,
                 rcc: &mut Rcc,
-            ) -> Result<Serial<$USARTX, TX, RX>, InvalidConfig>
+            ) -> Result<Serial<Self, TX, RX>, InvalidConfig>
             where
-                TX: TxPin<$USARTX>,
-                RX: RxPin<$USARTX>,
+                TX: TxPin<Self>,
+                RX: RxPin<Self>,
             {
                 Serial::$usartX(self, tx, rx, config, rcc)
             }
@@ -551,9 +551,11 @@ macro_rules! uart_lp {
                 usart: $USARTX,
                 tx: TX,
                 rx: RX,
-                config: LowPowerConfig,
+                config: impl Into<LowPowerConfig>,
                 rcc: &mut Rcc,
             ) -> Result<Self, InvalidConfig> {
+                let config = config.into();
+
                 // Enable clock for USART
                 $USARTX::enable(rcc);
                 $USARTX::reset(rcc);
@@ -670,17 +672,17 @@ macro_rules! uart_full {
     ($USARTX:ident,
         $usartX:ident
     ) => {
-        impl SerialExt<$USARTX, FullConfig> for $USARTX {
+        impl SerialExt<FullConfig> for $USARTX {
             fn usart<TX, RX>(
                 self,
                 tx: TX,
                 rx: RX,
-                config: FullConfig,
+                config: impl Into<FullConfig>,
                 rcc: &mut Rcc,
-            ) -> Result<Serial<$USARTX, TX, RX>, InvalidConfig>
+            ) -> Result<Serial<Self, TX, RX>, InvalidConfig>
             where
-                TX: TxPin<$USARTX>,
-                RX: RxPin<$USARTX>,
+                TX: TxPin<Self>,
+                RX: RxPin<Self>,
             {
                 Serial::$usartX(self, tx, rx, config, rcc)
             }
@@ -695,9 +697,11 @@ macro_rules! uart_full {
                 usart: $USARTX,
                 tx: TX,
                 rx: RX,
-                config: FullConfig,
+                config: impl Into<FullConfig>,
                 rcc: &mut Rcc,
             ) -> Result<Self, InvalidConfig> {
+                let config = config.into();
+
                 // Enable clock for USART
                 $USARTX::enable(rcc);
                 $USARTX::reset(rcc);