test: use new i2s apis in qa-test

Author: AstrickHarren

qa-test/src/bin/embassy_i2s_read.rs

@@ -19,7 +19,9 @@
 use embassy_executor::Spawner;
 use esp_backtrace as _;
 use esp_hal::{
+    dma::DmaRxStreamBuf,
     dma_buffers,
+    dma_buffers_chunk_size,
     i2s::master::{DataFormat, I2s, Standard},
     time::Rate,
     timer::timg::TimerGroup,
@@ -44,7 +46,7 @@ async fn main(_spawner: Spawner) {
         }
     }
 
-    let (rx_buffer, rx_descriptors, _, _) = dma_buffers!(4092 * 4, 0);
+    let (rx_buffer, rx_descriptors, _, _) = dma_buffers_chunk_size!(4092 * 4, 0, 4092);
 
     let i2s = I2s::new(
         peripherals.I2S0,
@@ -58,23 +60,26 @@ async fn main(_spawner: Spawner) {
     #[cfg(not(feature = "esp32"))]
     let i2s = i2s.with_mclk(peripherals.GPIO0);
 
-    let mut i2s_rx = i2s
+    let i2s_rx = i2s
         .i2s_rx
         .with_bclk(peripherals.GPIO2)
         .with_ws(peripherals.GPIO4)
         .with_din(peripherals.GPIO5)
-        .build(rx_descriptors);
+        .build();
 
     let buffer = rx_buffer;
     println!("Start");
 
     let mut data = [0u8; 5000];
-    let mut transaction = i2s_rx.read_dma_circular_async(buffer).unwrap();
+    let mut transaction = i2s_rx
+        .read(DmaRxStreamBuf::new(rx_descriptors, buffer).unwrap(), 4092)
+        .unwrap();
     loop {
-        let avail = transaction.available().await.unwrap();
+        transaction.wait_for_available().await.unwrap();
+        let avail = transaction.available_bytes();
         println!("available {}", avail);
 
-        let count = transaction.pop(&mut data).await.unwrap();
+        let count = transaction.pop(&mut data);
 
         #[cfg(not(feature = "esp32s2"))]
         println!(

qa-test/src/bin/embassy_i2s_sound.rs

@@ -33,6 +33,7 @@
 use embassy_executor::Spawner;
 use esp_backtrace as _;
 use esp_hal::{
+    dma::DmaTxStreamBuf,
     dma_buffers,
     i2s::master::{DataFormat, I2s, Standard},
     time::Rate,
@@ -77,12 +78,12 @@ async fn main(_spawner: Spawner) {
     )
     .into_async();
 
-    let mut i2s_tx = i2s
+    let i2s_tx = i2s
         .i2s_tx
         .with_bclk(peripherals.GPIO2)
         .with_ws(peripherals.GPIO4)
         .with_dout(peripherals.GPIO5)
-        .build(tx_descriptors);
+        .build();
 
     let data =
         unsafe { core::slice::from_raw_parts(&SINE as *const _ as *const u8, SINE.len() * 2) };
@@ -103,14 +104,17 @@ async fn main(_spawner: Spawner) {
     let mut idx = 32000 % data.len();
 
     println!("Start");
-    let mut transaction = i2s_tx.write_dma_circular_async(buffer).unwrap();
+    let mut transaction = i2s_tx
+        .write(DmaTxStreamBuf::new(tx_descriptors, buffer).unwrap())
+        .unwrap();
     loop {
         for i in 0..filler.len() {
             filler[i] = data[(idx + i) % data.len()];
         }
         println!("Next");
 
-        let written = transaction.push(&filler).await.unwrap();
+        transaction.wait_for_available().await.unwrap();
+        let written = transaction.push(&filler);
         idx = (idx + written) % data.len();
         println!("written {}", written);
     }