From f1c372f2503aa644e09df414e66b168f38f89809 Mon Sep 17 00:00:00 2001
From: C2D <50617709+i404788@users.noreply.github.com>
Date: Thu, 19 Dec 2024 14:57:21 +0100
Subject: [PATCH] Fix SpiDmaBus write impl (#2843)

* Fix SpiDmaBus write impl

* Add hil test for SpiDmaBus::{read,write}

---------

Co-authored-by: ferris <ferris@devdroplets.com>
---
 esp-hal/src/spi/master.rs         |  2 +-
 hil-test/tests/spi_full_duplex.rs | 33 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/esp-hal/src/spi/master.rs b/esp-hal/src/spi/master.rs
index b49cb2e24..a3de6b792 100644
--- a/esp-hal/src/spi/master.rs
+++ b/esp-hal/src/spi/master.rs
@@ -1732,8 +1732,8 @@ mod dma {
 
                 unsafe {
                     self.spi_dma.start_dma_transfer(
-                        chunk.len(),
                         0,
+                        chunk.len(),
                         &mut EmptyBuf,
                         &mut self.tx_buf,
                     )?;
diff --git a/hil-test/tests/spi_full_duplex.rs b/hil-test/tests/spi_full_duplex.rs
index cc8a4b5ff..7938ba4dd 100644
--- a/hil-test/tests/spi_full_duplex.rs
+++ b/hil-test/tests/spi_full_duplex.rs
@@ -447,6 +447,39 @@ mod tests {
         );
     }
 
+    #[test]
+    #[cfg(pcnt)]
+    fn test_dma_bus_read_write_pcnt(ctx: Context) {
+        const TRANSFER_SIZE: usize = 4;
+        let (rx_buffer, rx_descriptors, tx_buffer, tx_descriptors) = dma_buffers!(4);
+        let dma_rx_buf = DmaRxBuf::new(rx_descriptors, rx_buffer).unwrap();
+        let dma_tx_buf = DmaTxBuf::new(tx_descriptors, tx_buffer).unwrap();
+
+        ctx.pcnt_unit.channel0.set_edge_signal(ctx.pcnt_source);
+        ctx.pcnt_unit
+            .channel0
+            .set_input_mode(EdgeMode::Hold, EdgeMode::Increment);
+
+        let mut spi = ctx
+            .spi
+            .with_dma(ctx.dma_channel)
+            .with_buffers(dma_rx_buf, dma_tx_buf);
+
+        // Fill the buffer where each byte has 3 pos edges.
+        let tx_buf = [0b0110_1010; TRANSFER_SIZE];
+        let mut rx_buf = [0; TRANSFER_SIZE];
+
+        for i in 1..4 {
+            // Preset as 5, expect 0 repeated receive
+            rx_buf.copy_from_slice(&[5; TRANSFER_SIZE]);
+            spi.read(&mut rx_buf).unwrap();
+            assert_eq!(rx_buf, [0; TRANSFER_SIZE]);
+
+            spi.write(&tx_buf).unwrap();
+            assert_eq!(ctx.pcnt_unit.value(), (i * 3 * TRANSFER_SIZE) as _);
+        }
+    }
+
     #[test]
     fn test_dma_bus_symmetric_transfer(ctx: Context) {
         let (rx_buffer, rx_descriptors, tx_buffer, tx_descriptors) = dma_buffers!(4);