Erase i2s

esp-hal/CHANGELOG.md

@@ -14,11 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add burst transfer support to DMA buffers (#2336)
 - `AnyPin` now implements `From<GpioPin<N>>`. (#2326)
 - Added `AnySpi` and `AnySpiDmaChannel`. (#2334)
+- Added `AnyI2s` and `AnyI2sDmaChannel`. (#2367)
 - `Pins::steal()` to unsafely obtain GPIO. (#2335)
 
 ### Changed
 
 - Peripheral type erasure for SPI (#2334)
+- Peripheral type erasure for I2S (#2367)
 
 ### Fixed
 

esp-hal/MIGRATING-0.21.md

@@ -29,13 +29,17 @@ You no longer have to specify the peripheral instance in the driver's type for t
 peripherals:
 
 - SPI (both master and slave)
+- I2S
 
 ```diff
 -Spi<'static, SPI2, FullDuplexMode>
 +Spi<'static, FullDuplexMode>
 
 -SpiDma<'static, SPI2, HalfDuplexMode, Blocking>
 +SpiDma<'static, HalfDuplexMode, Blocking>
+
+-I2sTx<'static, I2S0, Async>
++I2sTx<'static, Async>
 ```
 
 Note that you may still specify the instance if you need to. To do this, we provide `_typed`

esp-hal/src/dma/pdma.rs

@@ -787,6 +787,15 @@ macro_rules! ImplI2sChannel {
                 }
             }
 
+            impl DmaChannelConvert<AnyI2sDmaChannel> for [<I2s $num DmaChannel>] {
+                fn degrade_rx(rx: I2sDmaRxChannelImpl<Self>) -> I2sDmaRxChannelImpl<AnyI2sDmaChannelInner> {
+                    I2sDmaRxChannelImpl(rx.0.into())
+                }
+                fn degrade_tx(tx: I2sDmaTxChannelImpl<Self>) -> I2sDmaTxChannelImpl<AnyI2sDmaChannelInner> {
+                    I2sDmaTxChannelImpl(tx.0.into())
+                }
+            }
+
             #[doc = concat!("Creates a channel for I2S", $num)]
             pub struct [<I2s $num DmaChannelCreator>] {}
 
@@ -942,3 +951,41 @@ impl PdmaChannel for AnySpiDmaChannelInner {
         }
     }
 }
+
+/// A marker for I2S-compatible type-erased DMA channels.
+pub struct AnyI2sDmaChannel;
+
+impl crate::private::Sealed for AnyI2sDmaChannel {}
+
+impl DmaChannel for AnyI2sDmaChannel {
+    type Rx = I2sDmaRxChannelImpl<AnyI2sDmaChannelInner>;
+    type Tx = I2sDmaTxChannelImpl<AnyI2sDmaChannelInner>;
+}
+
+crate::any_enum! {
+    #[doc(hidden)]
+    pub enum AnyI2sDmaChannelInner {
+        I2s0(I2s0DmaChannel),
+        #[cfg(i2s1)]
+        I2s1(I2s1DmaChannel),
+    }
+}
+
+impl crate::private::Sealed for AnyI2sDmaChannelInner {}
+
+impl PdmaChannel for AnyI2sDmaChannelInner {
+    type RegisterBlock = I2sRegisterBlock;
+
+    delegate::delegate! {
+        to match self {
+            AnyI2sDmaChannelInner::I2s0(channel) => channel,
+            #[cfg(i2s1)]
+            AnyI2sDmaChannelInner::I2s1(channel) => channel,
+        } {
+            fn register_block(&self) -> &I2sRegisterBlock;
+            fn tx_waker(&self) -> &'static AtomicWaker;
+            fn rx_waker(&self) -> &'static AtomicWaker;
+            fn is_compatible_with(&self, peripheral: &impl PeripheralMarker) -> bool;
+        }
+    }
+}