Introduce shared new_inner for uart instantiation
@@ -222,10 +222,48 @@ impl<'d, T: BasicInstance, TxDma, RxDma> Uart<'d, T, TxDma, RxDma> {
rx_dma: impl Peripheral<P = RxDma> + 'd,
config: Config,
) -> Self {
- into_ref!(_inner, rx, tx, tx_dma, rx_dma);
+ T::enable();
+ T::reset();
+
+ Self::new_inner(_inner, rx, tx, tx_dma, rx_dma, config)
+ }
+
+ pub fn new_with_rtscts(
+ _inner: impl Peripheral<P = T> + 'd,
+ rx: impl Peripheral<P = impl RxPin<T>> + 'd,
+ tx: impl Peripheral<P = impl TxPin<T>> + 'd,
+ rts: impl Peripheral<P = impl RtsPin<T>> + 'd,
+ cts: impl Peripheral<P = impl CtsPin<T>> + 'd,
+ tx_dma: impl Peripheral<P = TxDma> + 'd,
+ rx_dma: impl Peripheral<P = RxDma> + 'd,
+ config: Config,
+ ) -> Self {
+ into_ref!(cts, rts);
T::enable();
T::reset();
+
+ unsafe {
+ rts.set_as_af(rts.af_num(), AFType::OutputPushPull);
+ cts.set_as_af(cts.af_num(), AFType::Input);
+ T::regs().cr3().write(|w| {
+ w.set_rtse(true);
+ w.set_ctse(true);
+ });
+ }
+ Self::new_inner(_inner, rx, tx, tx_dma, rx_dma, config)
+ }
+
+ fn new_inner(
+ _inner: impl Peripheral<P = T> + 'd,
+ rx: impl Peripheral<P = impl RxPin<T>> + 'd,
+ tx: impl Peripheral<P = impl TxPin<T>> + 'd,
+ tx_dma: impl Peripheral<P = TxDma> + 'd,
+ rx_dma: impl Peripheral<P = RxDma> + 'd,
+ config: Config,
+ ) -> Self {
+ into_ref!(_inner, rx, tx, tx_dma, rx_dma);
+
let pclk_freq = T::frequency();
// TODO: better calculation, including error checking and OVER8 if possible.
@@ -264,29 +302,6 @@ impl<'d, T: BasicInstance, TxDma, RxDma> Uart<'d, T, TxDma, RxDma> {
}
}
- pub fn new_with_rtscts(
- _inner: impl Peripheral<P = T> + 'd,
- rx: impl Peripheral<P = impl RxPin<T>> + 'd,
- tx: impl Peripheral<P = impl TxPin<T>> + 'd,
- rts: impl Peripheral<P = impl RtsPin<T>> + 'd,
- cts: impl Peripheral<P = impl CtsPin<T>> + 'd,
- tx_dma: impl Peripheral<P = TxDma> + 'd,
- rx_dma: impl Peripheral<P = RxDma> + 'd,
- config: Config,
- ) -> Self {
- into_ref!(cts, rts);
-
- unsafe {
- rts.set_as_af(rts.af_num(), AFType::OutputPushPull);
- cts.set_as_af(cts.af_num(), AFType::Input);
- T::regs().cr3().write(|w| {
- w.set_rtse(true);
- w.set_ctse(true);
- });
- }
- Self::new(_inner, rx, tx, tx_dma, rx_dma, config)
- }
-
pub async fn write(&mut self, buffer: &[u8]) -> Result<(), Error>
where
TxDma: crate::usart::TxDma<T>,
