From f1feedf19031d0c007628569add51ff89ae08447 Mon Sep 17 00:00:00 2001
From: Michael Gomez <m.nathan.gomez@gmail.com>
Date: Wed, 19 Mar 2025 20:44:16 -0700
Subject: BufferedUart initialization

This change modifies UART initialization throughout Embassy to take pins
before interrupts.

Related to #1304.
---
 tests/nrf/src/bin/buffered_uart.rs        | 2 +-
 tests/nrf/src/bin/buffered_uart_full.rs   | 2 +-
 tests/nrf/src/bin/buffered_uart_halves.rs | 2 +-
 tests/nrf/src/bin/uart_split.rs           | 2 +-
 tests/rp/src/bin/uart_buffered.rs         | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/nrf/src/bin/buffered_uart.rs b/tests/nrf/src/bin/buffered_uart.rs
index 2eecafb95..8c4827464 100644
--- a/tests/nrf/src/bin/buffered_uart.rs
+++ b/tests/nrf/src/bin/buffered_uart.rs
@@ -30,9 +30,9 @@ async fn main(_spawner: Spawner) {
             p.PPI_CH0.reborrow(),
             p.PPI_CH1.reborrow(),
             p.PPI_GROUP0.reborrow(),
-            irqs!(UART0_BUFFERED),
             peri!(p, PIN_A).reborrow(),
             peri!(p, PIN_B).reborrow(),
+            irqs!(UART0_BUFFERED),
             config.clone(),
             &mut rx_buffer,
             &mut tx_buffer,
diff --git a/tests/nrf/src/bin/buffered_uart_full.rs b/tests/nrf/src/bin/buffered_uart_full.rs
index 09353bbe8..e0f41b891 100644
--- a/tests/nrf/src/bin/buffered_uart_full.rs
+++ b/tests/nrf/src/bin/buffered_uart_full.rs
@@ -28,9 +28,9 @@ async fn main(_spawner: Spawner) {
         p.PPI_CH0,
         p.PPI_CH1,
         p.PPI_GROUP0,
-        irqs!(UART0_BUFFERED),
         peri!(p, PIN_A),
         peri!(p, PIN_B),
+        irqs!(UART0_BUFFERED),
         config.clone(),
         &mut rx_buffer,
         &mut tx_buffer,
diff --git a/tests/nrf/src/bin/buffered_uart_halves.rs b/tests/nrf/src/bin/buffered_uart_halves.rs
index adfba509d..e6debd76e 100644
--- a/tests/nrf/src/bin/buffered_uart_halves.rs
+++ b/tests/nrf/src/bin/buffered_uart_halves.rs
@@ -28,8 +28,8 @@ async fn main(_spawner: Spawner) {
 
         let mut tx = BufferedUarteTx::new(
             peri!(p, UART1).reborrow(),
-            irqs!(UART1_BUFFERED),
             peri!(p, PIN_A).reborrow(),
+            irqs!(UART1_BUFFERED),
             config.clone(),
             &mut tx_buffer,
         );
diff --git a/tests/nrf/src/bin/uart_split.rs b/tests/nrf/src/bin/uart_split.rs
index f24903297..8fe710068 100644
--- a/tests/nrf/src/bin/uart_split.rs
+++ b/tests/nrf/src/bin/uart_split.rs
@@ -22,9 +22,9 @@ async fn main(_spawner: Spawner) {
 
     let uarte = Uarte::new(
         peri!(p, UART0).reborrow(),
-        irqs!(UART0),
         peri!(p, PIN_A).reborrow(),
         peri!(p, PIN_B).reborrow(),
+        irqs!(UART0),
         config.clone(),
     );
     let (mut tx, mut rx) = uarte.split();
diff --git a/tests/rp/src/bin/uart_buffered.rs b/tests/rp/src/bin/uart_buffered.rs
index b270a60ce..d5f655e9b 100644
--- a/tests/rp/src/bin/uart_buffered.rs
+++ b/tests/rp/src/bin/uart_buffered.rs
@@ -75,9 +75,9 @@ async fn main(_spawner: Spawner) {
         let rx_buf = &mut [0u8; 16];
         let mut uart = BufferedUart::new(
             uart.reborrow(),
-            Irqs,
             tx.reborrow(),
             rx.reborrow(),
+            Irqs,
             tx_buf,
             rx_buf,
             config,
@@ -103,9 +103,9 @@ async fn main(_spawner: Spawner) {
         let rx_buf = &mut [0u8; 16];
         let mut uart = BufferedUart::new(
             uart.reborrow(),
-            Irqs,
             tx.reborrow(),
             rx.reborrow(),
+            Irqs,
             tx_buf,
             rx_buf,
             config,
@@ -146,9 +146,9 @@ async fn main(_spawner: Spawner) {
         let rx_buf = &mut [0u8; 16];
         let mut uart = BufferedUart::new(
             uart.reborrow(),
-            Irqs,
             tx.reborrow(),
             rx.reborrow(),
+            Irqs,
             tx_buf,
             rx_buf,
             config,
-- 
cgit