Fix mem2mem, fix S3 peripherals

esp-rs · Oct 7, 2024 · cae9ebb · cae9ebb
1 parent 625b034
commit cae9ebb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/esp-hal/src/dma/gdma.rs b/esp-hal/src/dma/gdma.rs
@@ -571,18 +571,24 @@ crate::impl_dma_eligible! {
         #[cfg(i2s1)]
         I2S1 => I2s1,
 
+        #[cfg(esp32s3)]
+        LCD_CAM => LcdCam,
+
         #[cfg(all(gdma, aes))]
         AES => Aes,
 
         #[cfg(all(gdma, sha))]
         SHA => Sha,
 
-        #[cfg(any(esp32c3, esp32c6, esp32h2))]
+        #[cfg(any(esp32c3, esp32c6, esp32h2, esp32s3))]
         ADC1 => Adc,
 
-        #[cfg(esp32c3)]
+        #[cfg(any(esp32c3, esp32s3))]
         ADC2 => Adc,
 
+        #[cfg(esp32s3)]
+        RMT => Rmt,
+
         #[cfg(parl_io)]
         PARL_IO => ParlIo,
 

diff --git a/hil-test/tests/dma_mem2mem.rs b/hil-test/tests/dma_mem2mem.rs
@@ -6,7 +6,7 @@
 #![no_main]
 
 use esp_hal::{
-    dma::{AnyDmaChannel, Channel, Dma, DmaError, DmaPriority, Mem2Mem},
+    dma::{AnyGdmaChannel, Channel, Dma, DmaError, DmaPriority, Mem2Mem},
     dma_buffers,
     dma_buffers_chunk_size,
     dma_descriptors,
@@ -25,7 +25,7 @@ cfg_if::cfg_if! {
 }
 
 struct Context {
-    channel: Channel<'static, AnyDmaChannel, Blocking>,
+    channel: Channel<'static, AnyGdmaChannel, Blocking>,
     dma_peripheral: DmaPeripheralType,
 }