Remove TxPrivate and RxPrivate (#2225)

esp-hal/src/aes/mod.rs

@@ -245,8 +245,8 @@ pub mod dma {
             DmaPeripheral,
             DmaTransferRxTx,
             ReadBuffer,
-            RxPrivate,
-            TxPrivate,
+            Rx,
+            Tx,
             WriteBuffer,
         },
     };

esp-hal/src/dma/gdma.rs

@@ -619,8 +619,8 @@ mod m2m {
         DmaPeripheral,
         DmaTransferRx,
         ReadBuffer,
-        RxPrivate,
-        TxPrivate,
+        Rx,
+        Tx,
         WriteBuffer,
     };
 

esp-hal/src/dma/mod.rs

@@ -830,14 +830,6 @@ pub trait AesPeripheral: PeripheralMarker {}
 #[doc(hidden)]
 pub trait LcdCamPeripheral: PeripheralMarker {}
 
-/// DMA Rx
-#[doc(hidden)]
-pub trait Rx: RxPrivate {}
-
-/// DMA Tx
-#[doc(hidden)]
-pub trait Tx: TxPrivate {}
-
 /// Marker trait
 #[doc(hidden)]
 pub trait PeripheralMarker {}
@@ -1080,7 +1072,7 @@ impl TxCircularState {
 
     pub(crate) fn update<T>(&mut self, channel: &T)
     where
-        T: TxPrivate,
+        T: Tx,
     {
         if channel
             .pending_out_interrupts()
@@ -1307,7 +1299,7 @@ pub trait DmaChannel: crate::private::Sealed {
 
 /// The functions here are not meant to be used outside the HAL
 #[doc(hidden)]
-pub trait RxPrivate: crate::private::Sealed {
+pub trait Rx: crate::private::Sealed {
     fn init(&mut self, burst_mode: bool, priority: DmaPriority);
 
     unsafe fn prepare_transfer_without_start(
@@ -1429,11 +1421,9 @@ where
     }
 }
 
-impl<'a, CH> Rx for ChannelRx<'a, CH> where CH: DmaChannel {}
-
 impl<'a, CH> crate::private::Sealed for ChannelRx<'a, CH> where CH: DmaChannel {}
 
-impl<'a, CH> RxPrivate for ChannelRx<'a, CH>
+impl<'a, CH> Rx for ChannelRx<'a, CH>
 where
     CH: DmaChannel,
 {
@@ -1543,7 +1533,7 @@ where
 
 /// The functions here are not meant to be used outside the HAL
 #[doc(hidden)]
-pub trait TxPrivate: crate::private::Sealed {
+pub trait Tx: crate::private::Sealed {
     fn init(&mut self, burst_mode: bool, priority: DmaPriority);
 
     unsafe fn prepare_transfer_without_start(
@@ -1669,11 +1659,9 @@ where
     }
 }
 
-impl<'a, CH> Tx for ChannelTx<'a, CH> where CH: DmaChannel {}
-
 impl<'a, CH> crate::private::Sealed for ChannelTx<'a, CH> where CH: DmaChannel {}
 
-impl<'a, CH> TxPrivate for ChannelTx<'a, CH>
+impl<'a, CH> Tx for ChannelTx<'a, CH>
 where
     CH: DmaChannel,
 {

esp-hal/src/i2s.rs

@@ -103,8 +103,8 @@ use crate::{
         I2s0Peripheral,
         I2sPeripheral,
         ReadBuffer,
-        RxPrivate,
-        TxPrivate,
+        Rx,
+        Tx,
         WriteBuffer,
     },
     gpio::PeripheralOutput,
@@ -2099,10 +2099,10 @@ pub mod asynch {
             asynch::{DmaRxDoneChFuture, DmaRxFuture, DmaTxDoneChFuture, DmaTxFuture},
             DmaChannel,
             ReadBuffer,
+            Rx,
             RxCircularState,
-            RxPrivate,
+            Tx,
             TxCircularState,
-            TxPrivate,
             WriteBuffer,
         },
         Async,

esp-hal/src/lcd_cam/cam.rs

@@ -78,7 +78,7 @@ use crate::{
         DmaTransferRx,
         DmaTransferRxCircular,
         LcdCamPeripheral,
-        RxPrivate,
+        Rx,
         WriteBuffer,
     },
     gpio::{InputPin, InputSignal, OutputPin, OutputSignal, Pull},

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

@@ -74,7 +74,7 @@ use crate::{
         DmaTransferTx,
         LcdCamPeripheral,
         ReadBuffer,
-        TxPrivate,
+        Tx,
     },
     gpio::{OutputSignal, PeripheralOutput},
     lcd_cam::{

esp-hal/src/parl_io.rs

@@ -45,8 +45,8 @@ use crate::{
         DmaTransferTx,
         ParlIoPeripheral,
         ReadBuffer,
-        RxPrivate,
-        TxPrivate,
+        Rx,
+        Tx,
         WriteBuffer,
     },
     gpio::{PeripheralInput, PeripheralOutput},

esp-hal/src/spi/master.rs

@@ -881,10 +881,10 @@ mod dma {
             DmaRxBuffer,
             DmaTxBuf,
             DmaTxBuffer,
-            RxPrivate,
+            Rx,
             Spi2Peripheral,
             SpiPeripheral,
-            TxPrivate,
+            Tx,
         },
         InterruptConfigurable,
         Mode,

esp-hal/src/spi/slave.rs

@@ -172,10 +172,10 @@ pub mod dma {
             DmaTransferRxTx,
             DmaTransferTx,
             ReadBuffer,
-            RxPrivate,
+            Rx,
             Spi2Peripheral,
             SpiPeripheral,
-            TxPrivate,
+            Tx,
             WriteBuffer,
         },
         Mode,