Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Implement `defmt::Format` for more types (#786)
- Add new_no_miso to Spi FullDuplexMode (#794)
- Add UART support for splitting into TX and RX (#754)
- Async support for I2S (#801)

### Changed

Expand Down
106 changes: 106 additions & 0 deletions esp-hal-common/src/dma/gdma.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,59 @@ macro_rules! impl_channel {
dma.[<out_link_ch $num>].modify(|_, w| w.outlink_start().set_bit());
}

fn clear_ch_out_done() {
let dma = unsafe { &*crate::peripherals::DMA::PTR };

#[cfg(not(any(esp32c6, esp32h2, esp32s3)))]
dma.[<int_clr_ch $num>].write(|w| w.out_done().set_bit());
#[cfg(any(esp32c6, esp32h2, esp32s3))]
dma.[<out_int_clr_ch $num>].write(|w| w.out_done().set_bit());
}

fn is_ch_out_done_set() -> bool {
let dma = unsafe { &*crate::peripherals::DMA::PTR };

#[cfg(not(any(esp32c6, esp32h2, esp32s3)))]
let ret = dma.[<int_raw_ch $num>].read().out_done().bit();
#[cfg(any(esp32c6, esp32h2, esp32s3))]
let ret = dma.[<out_int_raw_ch $num>].read().out_done().bit();

ret
}

fn listen_ch_out_done() {
let dma = unsafe { &*crate::peripherals::DMA::PTR };
cfg_if::cfg_if! {
if #[cfg(any(esp32c6, esp32h2, esp32s3))] {
dma.[<out_int_ena_ch $num>].modify(|_, w| w.out_done().set_bit())
} else {
dma.[<int_ena_ch $num>].modify(|_, w| w.out_done().set_bit())
}
}
}

fn unlisten_ch_out_done() {
let dma = unsafe { &*crate::peripherals::DMA::PTR };
cfg_if::cfg_if! {
if #[cfg(any(esp32c6, esp32h2, esp32s3))] {
dma.[<out_int_ena_ch $num>].modify(|_, w| w.out_done().clear_bit())
} else {
dma.[<int_ena_ch $num>].modify(|_, w| w.out_done().clear_bit())
}
}
}

fn is_listening_ch_out_done() -> bool {
let dma = unsafe { &*crate::peripherals::DMA::PTR };
cfg_if::cfg_if! {
if #[cfg(any(esp32c6, esp32h2, esp32s3))] {
dma.[<out_int_ena_ch $num>].read().out_done().bit()
} else {
dma.[<int_ena_ch $num>].read().out_done().bit()
}
}
}

fn is_out_done() -> bool {
let dma = unsafe { &*crate::peripherals::DMA::PTR };

Expand Down Expand Up @@ -413,6 +466,59 @@ macro_rules! impl_channel {
}
}
}

fn listen_ch_in_done(){
let dma = unsafe { &*crate::peripherals::DMA::PTR };
cfg_if::cfg_if! {
if #[cfg(any(esp32c6, esp32h2, esp32s3))] {
dma.[<in_int_ena_ch $num>].modify(|_, w| w.in_done().set_bit())
} else {
dma.[<int_ena_ch $num>].modify(|_, w| w.in_done().set_bit())
}
}
}

fn clear_ch_in_done(){
let dma = unsafe { &*crate::peripherals::DMA::PTR };

#[cfg(not(any(esp32c6, esp32h2, esp32s3)))]
dma.[<int_clr_ch $num>].write(|w| w.in_done().set_bit());
#[cfg(any(esp32c6, esp32h2, esp32s3))]
dma.[<in_int_clr_ch $num>].write(|w| w.in_done().set_bit());
}

fn is_ch_in_done_set() -> bool {
let dma = unsafe { &*crate::peripherals::DMA::PTR };

#[cfg(not(any(esp32c6, esp32h2, esp32s3)))]
let ret = dma.[<int_raw_ch $num>].read().in_done().bit();
#[cfg(any(esp32c6, esp32h2, esp32s3))]
let ret = dma.[<in_int_raw_ch $num>].read().in_done().bit();

ret
}

fn unlisten_ch_in_done() {
let dma = unsafe { &*crate::peripherals::DMA::PTR };
cfg_if::cfg_if! {
if #[cfg(any(esp32c6, esp32h2, esp32s3))] {
dma.[<in_int_ena_ch $num>].modify(|_, w| w.in_done().clear_bit())
} else {
dma.[<int_ena_ch $num>].modify(|_, w| w.in_done().clear_bit())
}
}
}

fn is_listening_ch_in_done() -> bool {
let dma = unsafe { &*crate::peripherals::DMA::PTR };
cfg_if::cfg_if! {
if #[cfg(any(esp32c6, esp32h2, esp32s3))] {
dma.[<in_int_ena_ch $num>].read().in_done().bit()
} else {
dma.[<int_ena_ch $num>].read().in_done().bit()
}
}
}
}

#[non_exhaustive]
Expand Down
Loading