From 71c130488b465012d1cb076deb182c5946c011d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Alse=CC=81r?= <henrik.alser@me.com>
Date: Wed, 31 Aug 2022 22:12:14 +0200
Subject: [PATCH] Reorder args

---
 embassy-rp/src/spi.rs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/embassy-rp/src/spi.rs b/embassy-rp/src/spi.rs
index 8ae1c8b0..c5d9647d 100644
--- a/embassy-rp/src/spi.rs
+++ b/embassy-rp/src/spi.rs
@@ -67,12 +67,12 @@ fn calc_prescs(freq: u32) -> (u8, u8) {
 impl<'d, T: Instance, M: Mode> Spi<'d, T, M> {
     fn new_inner(
         inner: impl Peripheral<P = T> + 'd,
-        tx_dma: Option<PeripheralRef<'d, AnyChannel>>,
-        rx_dma: Option<PeripheralRef<'d, AnyChannel>>,
         clk: Option<PeripheralRef<'d, AnyPin>>,
         mosi: Option<PeripheralRef<'d, AnyPin>>,
         miso: Option<PeripheralRef<'d, AnyPin>>,
         cs: Option<PeripheralRef<'d, AnyPin>>,
+        tx_dma: Option<PeripheralRef<'d, AnyChannel>>,
+        rx_dma: Option<PeripheralRef<'d, AnyChannel>>,
         config: Config,
     ) -> Self {
         into_ref!(inner);
@@ -212,12 +212,12 @@ impl<'d, T: Instance> Spi<'d, T, Blocking> {
         into_ref!(clk, mosi, miso);
         Self::new_inner(
             inner,
-            None,
-            None,
             Some(clk.map_into()),
             Some(mosi.map_into()),
             Some(miso.map_into()),
             None,
+            None,
+            None,
             config,
         )
     }
@@ -231,12 +231,12 @@ impl<'d, T: Instance> Spi<'d, T, Blocking> {
         into_ref!(clk, mosi);
         Self::new_inner(
             inner,
-            None,
-            None,
             Some(clk.map_into()),
             Some(mosi.map_into()),
             None,
             None,
+            None,
+            None,
             config,
         )
     }
@@ -250,12 +250,12 @@ impl<'d, T: Instance> Spi<'d, T, Blocking> {
         into_ref!(clk, miso);
         Self::new_inner(
             inner,
-            None,
-            None,
             Some(clk.map_into()),
             None,
             Some(miso.map_into()),
             None,
+            None,
+            None,
             config,
         )
     }
@@ -274,52 +274,52 @@ impl<'d, T: Instance> Spi<'d, T, Async> {
         into_ref!(tx_dma, rx_dma, clk, mosi, miso);
         Self::new_inner(
             inner,
-            Some(tx_dma.map_into()),
-            Some(rx_dma.map_into()),
             Some(clk.map_into()),
             Some(mosi.map_into()),
             Some(miso.map_into()),
             None,
+            Some(tx_dma.map_into()),
+            Some(rx_dma.map_into()),
             config,
         )
     }
 
     pub fn new_txonly(
         inner: impl Peripheral<P = T> + 'd,
-        tx_dma: impl Peripheral<P = impl Channel> + 'd,
         clk: impl Peripheral<P = impl ClkPin<T> + 'd> + 'd,
         mosi: impl Peripheral<P = impl MosiPin<T> + 'd> + 'd,
+        tx_dma: impl Peripheral<P = impl Channel> + 'd,
         config: Config,
     ) -> Self {
         into_ref!(tx_dma, clk, mosi);
         Self::new_inner(
             inner,
-            Some(tx_dma.map_into()),
-            None,
             Some(clk.map_into()),
             Some(mosi.map_into()),
             None,
             None,
+            Some(tx_dma.map_into()),
+            None,
             config,
         )
     }
 
     pub fn new_rxonly(
         inner: impl Peripheral<P = T> + 'd,
-        rx_dma: impl Peripheral<P = impl Channel> + 'd,
         clk: impl Peripheral<P = impl ClkPin<T> + 'd> + 'd,
         miso: impl Peripheral<P = impl MisoPin<T> + 'd> + 'd,
+        rx_dma: impl Peripheral<P = impl Channel> + 'd,
         config: Config,
     ) -> Self {
         into_ref!(rx_dma, clk, miso);
         Self::new_inner(
             inner,
-            None,
-            Some(rx_dma.map_into()),
             Some(clk.map_into()),
             None,
             Some(miso.map_into()),
             None,
+            None,
+            Some(rx_dma.map_into()),
             config,
         )
     }