Use PeripheralDmaChannel on constructors only

Author: bugadani

esp-hal/src/aes/mod.rs

@@ -236,6 +236,7 @@ pub mod dma {
         dma::{
             dma_private::{DmaSupport, DmaSupportRx, DmaSupportTx},
             AesPeripheral,
+            AnyDmaChannel,
             Channel,
             ChannelRx,
             ChannelTx,
@@ -252,8 +253,6 @@ pub mod dma {
         },
     };
 
-    type DefaultChannel = crate::dma::AnyDmaChannel;
-
     const ALIGN_SIZE: usize = core::mem::size_of::<u32>();
 
     /// Specifies the block cipher modes available for AES operations.
@@ -273,7 +272,7 @@ pub mod dma {
     }
 
     /// A DMA capable AES instance.
-    pub struct AesDma<'d, C = DefaultChannel>
+    pub struct AesDma<'d, C = AnyDmaChannel>
     where
         C: DmaChannel,
     {
@@ -285,32 +284,33 @@ pub mod dma {
         tx_chain: DescriptorChain,
     }
 
-    /// Functionality for using AES with DMA.
-    pub trait WithDmaAes<'d, C>
-    where
-        C: PeripheralDmaChannel,
-        C::P: AesPeripheral,
-    {
+    impl<'d> crate::aes::Aes<'d> {
         /// Enable DMA for the current instance of the AES driver
-        fn with_dma(
+        pub fn with_dma<C>(
             self,
             channel: Channel<'d, C, crate::Blocking>,
             rx_descriptors: &'static mut [DmaDescriptor],
             tx_descriptors: &'static mut [DmaDescriptor],
-        ) -> AesDma<'d, C>;
-    }
+        ) -> AesDma<'d>
+        where
+            Self: Sized,
+            C: PeripheralDmaChannel,
+            C::P: AesPeripheral,
+        {
+            self.with_dma_typed(channel.degrade(), rx_descriptors, tx_descriptors)
+        }
 
-    impl<'d, C> WithDmaAes<'d, C> for crate::aes::Aes<'d>
-    where
-        C: PeripheralDmaChannel,
-        C::P: AesPeripheral,
-    {
-        fn with_dma(
+        /// Enable DMA for the current instance of the AES driver
+        pub fn with_dma_typed<C>(
             self,
             channel: Channel<'d, C, crate::Blocking>,
             rx_descriptors: &'static mut [DmaDescriptor],
             tx_descriptors: &'static mut [DmaDescriptor],
-        ) -> AesDma<'d, C> {
+        ) -> AesDma<'d, C>
+        where
+            C: PeripheralDmaChannel,
+            C::P: AesPeripheral,
+        {
             AesDma {
                 aes: self,
                 channel,

esp-hal/src/i2s.rs

@@ -435,7 +435,7 @@ where
 impl<'d, I, CH, DmaMode> I2s<'d, I, CH, DmaMode>
 where
     I: RegisterAccess,
-    CH: PeripheralDmaChannel,
+    CH: DmaChannel,
     DmaMode: Mode,
 {
     /// Construct a new I2S peripheral driver instance for the first I2S
@@ -452,6 +452,7 @@ where
     ) -> Self
     where
         I: I2s0Instance,
+        CH: PeripheralDmaChannel,
         CH::P: I2sPeripheral + I2s0Peripheral,
         DmaMode: Mode,
     {
@@ -481,6 +482,7 @@ where
     ) -> Self
     where
         I: I2s1Instance,
+        CH: PeripheralDmaChannel,
         CH::P: I2sPeripheral + I2s1Peripheral,
     {
         Self::new_internal(

esp-hal/src/lcd_cam/cam.rs

@@ -82,6 +82,7 @@ use crate::{
         DmaPeripheral,
         DmaRxBuffer,
         LcdCamPeripheral,
+        PeripheralDmaChannel,
         Rx,
     },
     gpio::{InputPin, InputSignal, OutputPin, OutputSignal, Pull},
@@ -134,17 +135,35 @@ pub struct Camera<'d, CH: DmaChannel = AnyDmaChannel> {
     rx_channel: ChannelRx<'d, CH>,
 }
 
-impl<'d, CH: DmaChannel> Camera<'d, CH>
-where
-    CH::P: LcdCamPeripheral,
-{
+impl<'d> Camera<'d> {
     /// Creates a new `Camera` instance with DMA support.
-    pub fn new<P: RxPins>(
+    pub fn new<P: RxPins, CH>(
+        cam: Cam<'d>,
+        channel: ChannelRx<'d, CH>,
+        descriptors: &'static mut [DmaDescriptor],
+        pins: P,
+        frequency: HertzU32,
+    ) -> Self
+    where
+        CH: PeripheralDmaChannel,
+        CH::P: LcdCamPeripheral,
+    {
+        Self::new_typed(cam, channel.degrade(), descriptors, pins, frequency)
+    }
+}
+
+impl<'d, CH: DmaChannel> Camera<'d, CH> {
+    /// Creates a new `Camera` instance with DMA support.
+    pub fn new_typed<P: RxPins>(
         cam: Cam<'d>,
         channel: ChannelRx<'d, CH>,
         _pins: P,
         frequency: HertzU32,
-    ) -> Self {
+    ) -> Self
+    where
+        CH: PeripheralDmaChannel,
+        CH::P: LcdCamPeripheral,
+    {
         let lcd_cam = cam.lcd_cam;
 
         let clocks = Clocks::get();

esp-hal/src/lcd_cam/lcd/i8080.rs

@@ -68,7 +68,16 @@ use fugit::HertzU32;
 
 use crate::{
     clock::Clocks,
-    dma::{ChannelTx, DmaChannel, DmaError, DmaPeripheral, DmaTxBuffer, LcdCamPeripheral, Tx},
+    dma::{
+        ChannelTx,
+        DmaChannel,
+        DmaError,
+        DmaPeripheral,
+        DmaTxBuffer,
+        LcdCamPeripheral,
+        PeripheralDmaChannel,
+        Tx,
+    },
     gpio::{OutputSignal, PeripheralOutput},
     lcd_cam::{
         asynch::LCD_DONE_WAKER,
@@ -90,18 +99,19 @@ pub struct I8080<'d, CH: DmaChannel, DM: Mode> {
     _phantom: PhantomData<DM>,
 }
 
-impl<'d, CH: DmaChannel, DM: Mode> I8080<'d, CH, DM>
-where
-    CH::P: LcdCamPeripheral,
-{
+impl<'d, CH: DmaChannel, DM: Mode> I8080<'d, CH, DM> {
     /// Creates a new instance of the I8080 LCD interface.
     pub fn new<P: TxPins>(
         lcd: Lcd<'d, DM>,
         channel: ChannelTx<'d, CH>,
         mut pins: P,
         frequency: HertzU32,
         config: Config,
-    ) -> Self {
+    ) -> Self
+    where
+        CH: PeripheralDmaChannel,
+        CH::P: LcdCamPeripheral,
+    {
         let lcd_cam = lcd.lcd_cam;
 
         let clocks = Clocks::get();

esp-hal/src/parl_io.rs

@@ -1114,8 +1114,7 @@ where
 
 impl<'d, CH, DM> ParlIoFullDuplex<'d, CH, DM>
 where
-    CH: PeripheralDmaChannel,
-    CH::P: ParlIoPeripheral,
+    CH: DmaChannel,
     DM: Mode,
 {
     /// Create a new instance of [ParlIoFullDuplex]
@@ -1125,7 +1124,11 @@ where
         tx_descriptors: &'static mut [DmaDescriptor],
         rx_descriptors: &'static mut [DmaDescriptor],
         frequency: HertzU32,
-    ) -> Result<Self, Error> {
+    ) -> Result<Self, Error>
+    where
+        CH: PeripheralDmaChannel,
+        CH::P: ParlIoPeripheral,
+    {
         internal_init(frequency)?;
 
         Ok(Self {
@@ -1200,8 +1203,7 @@ where
 
 impl<'d, CH, DM> ParlIoTxOnly<'d, CH, DM>
 where
-    CH: PeripheralDmaChannel,
-    CH::P: ParlIoPeripheral,
+    CH: DmaChannel,
     DM: Mode,
 {
     /// Create a new [ParlIoTxOnly]
@@ -1210,7 +1212,11 @@ where
         dma_channel: Channel<'d, CH, DM>,
         descriptors: &'static mut [DmaDescriptor],
         frequency: HertzU32,
-    ) -> Result<Self, Error> {
+    ) -> Result<Self, Error>
+    where
+        CH: PeripheralDmaChannel,
+        CH::P: ParlIoPeripheral,
+    {
         internal_init(frequency)?;
 
         Ok(Self {
@@ -1280,8 +1286,7 @@ where
 
 impl<'d, CH, DM> ParlIoRxOnly<'d, CH, DM>
 where
-    CH: PeripheralDmaChannel,
-    CH::P: ParlIoPeripheral,
+    CH: DmaChannel,
     DM: Mode,
 {
     /// Create a new [ParlIoRxOnly] instance
@@ -1290,7 +1295,11 @@ where
         dma_channel: Channel<'d, CH, DM>,
         descriptors: &'static mut [DmaDescriptor],
         frequency: HertzU32,
-    ) -> Result<Self, Error> {
+    ) -> Result<Self, Error>
+    where
+        CH: PeripheralDmaChannel,
+        CH::P: ParlIoPeripheral,
+    {
         internal_init(frequency)?;
 
         Ok(Self {