Skip to content

Update to newest PACs for C2/C3/S3 and clean up GDMA implementation #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjoernQ merged 1 commit into from
Nov 4, 2022
Merged

Update to newest PACs for C2/C3/S3 and clean up GDMA implementation #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions esp-hal-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ ufmt-write = { version = "0.1.0", optional = true }
# corresponding feature. We rename the PAC packages because we cannot
# have dependencies and features with the same names.
esp32 = { version = "0.14.0", features = ["critical-section"], optional = true }
esp32c2 = { version = "0.3.0", features = ["critical-section"], optional = true }
esp32c3 = { version = "0.6.0", features = ["critical-section"], optional = true }
esp32c2 = { version = "0.4.0", features = ["critical-section"], optional = true }
esp32c3 = { version = "0.7.0", features = ["critical-section"], optional = true }
esp32s2 = { version = "0.5.0", features = ["critical-section"], optional = true }
esp32s3 = { version = "0.6.0", features = ["critical-section"], optional = true }
esp32s3 = { version = "0.7.0", features = ["critical-section"], optional = true }

[features]
esp32 = ["esp32/rt" , "procmacros/xtensa", "xtensa-lx-rt/esp32", "xtensa-lx/esp32", "critical-section/restore-state-u32", "lock_api"]
Expand Down
182 changes: 54 additions & 128 deletions esp-hal-common/src/dma/gdma.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,17 @@ macro_rules! impl_channel {
fn set_out_burstmode(burst_mode: bool) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<out_conf0_ch $num>].modify(|_,w| {
w.[<out_data_burst_en_ch $num>]().bit(burst_mode)
.[<outdscr_burst_en_ch $num>]().bit(burst_mode)
});

#[cfg(esp32s3)]
dma.[<out_conf0_ch $num>].modify(|_,w| {
w.out_data_burst_en_ch().bit(burst_mode)
.outdscr_burst_en_ch().bit(burst_mode)
w.out_data_burst_en().bit(burst_mode)
.outdscr_burst_en().bit(burst_mode)
});
}

fn set_out_priority(priority: DmaPriority) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<out_pri_ch $num>].write(|w| {
w.[<tx_pri_ch $num>]().variant(priority as u8)
});

#[cfg(esp32s3)]
dma.[<out_pri_ch $num>].write(|w| {
w.tx_pri_ch().variant(priority as u8)
w.tx_pri().variant(priority as u8)
});
}

Expand All @@ -50,138 +37,101 @@ macro_rules! impl_channel {

#[cfg(not(esp32s3))]
dma.[<int_clr_ch $num>].write(|w| {
w.[<out_eof_ch $num _int_clr>]()
w.out_eof()
.set_bit()
.[<out_dscr_err_ch $num _int_clr>]()
.out_dscr_err()
.set_bit()
.[<out_done_ch $num _int_clr>]()
.out_done()
.set_bit()
.[<out_total_eof_ch $num _int_clr>]()
.out_total_eof()
.set_bit()
.[<outfifo_ovf_ch $num _int_clr>]()
.outfifo_ovf()
.set_bit()
.[<outfifo_udf_ch $num _int_clr>]()
.outfifo_udf()
.set_bit()
});

#[cfg(esp32s3)]
dma.[<out_int_clr_ch $num>].write(|w| {
w.out_eof_ch_int_clr()
w.out_eof()
.set_bit()
.out_dscr_err_ch_int_clr()
.out_dscr_err()
.set_bit()
.out_done_ch_int_clr()
.out_done()
.set_bit()
.out_total_eof_ch_int_clr()
.out_total_eof()
.set_bit()
.outfifo_ovf_l1_ch_int_clr()
.outfifo_ovf_l1()
.set_bit()
.outfifo_ovf_l3_ch_int_clr()
.outfifo_ovf_l3()
.set_bit()
.outfifo_udf_l1_ch_int_clr()
.outfifo_udf_l1()
.set_bit()
.outfifo_udf_l3_ch_int_clr()
.outfifo_udf_l3()
.set_bit()
});
}

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

#[cfg(not(esp32s3))]
dma.[<out_conf0_ch $num>].modify(|_, w| w.[<out_rst_ch $num>]().set_bit());
#[cfg(not(esp32s3))]
dma.[<out_conf0_ch $num>].modify(|_, w| w.[<out_rst_ch $num>]().clear_bit());

#[cfg(esp32s3)]
dma.[<out_conf0_ch $num>].modify(|_, w| w.out_rst_ch().set_bit());
#[cfg(esp32s3)]
dma.[<out_conf0_ch $num>].modify(|_, w| w.out_rst_ch().clear_bit());
dma.[<out_conf0_ch $num>].modify(|_, w| w.out_rst().set_bit());
dma.[<out_conf0_ch $num>].modify(|_, w| w.out_rst().clear_bit());
}

fn set_out_descriptors(address: u32) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<out_link_ch $num>]
.modify(|_, w| unsafe { w.[<outlink_addr_ch $num>]().bits(address) });

#[cfg(esp32s3)]
dma.[<out_link_ch $num>].modify(|_, w| unsafe { w.outlink_addr_ch().bits(address) });
dma.[<out_link_ch $num>].modify(|_, w| unsafe { w.outlink_addr().bits(address) });
}

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

#[cfg(esp32s3)]
let ret = dma.[<out_int_raw_ch $num>].read().out_dscr_err_ch_int_raw().bit();

#[cfg(not(esp32s3))]
let ret = dma.[<int_raw_ch $num>].read().[<out_dscr_err_ch $num _int_raw>]().bit();
let ret = dma.[<int_raw_ch $num>].read().out_dscr_err().bit();
#[cfg(esp32s3)]
let ret = dma.[<out_int_raw_ch $num>].read().out_dscr_err().bit();

ret
}

fn set_out_peripheral(peripheral: u8) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<out_peri_sel_ch $num>]
.modify(|_, w| w.[<peri_out_sel_ch $num>]().variant(peripheral));

#[cfg(esp32s3)]
dma.[<out_peri_sel_ch $num>].modify(|_, w| w.peri_out_sel_ch().variant(peripheral));
dma.[<out_peri_sel_ch $num>].modify(|_, w| w.peri_out_sel().variant(peripheral));
}

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

#[cfg(not(esp32s3))]
dma.[<out_link_ch $num>]
.modify(|_, w| w.[<outlink_start_ch $num>]().set_bit());

#[cfg(esp32s3)]
dma.[<out_link_ch $num>].modify(|_, w| w.outlink_start_ch().set_bit());
dma.[<out_link_ch $num>].modify(|_, w| w.outlink_start().set_bit());
}

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

#[cfg(not(esp32s3))]
let ret = dma.[<int_raw_ch $num>].read().[<out_total_eof_ch $num _int_raw>]().bit();

let ret = dma.[<int_raw_ch $num>].read().out_total_eof().bit();
#[cfg(esp32s3)]
let ret = dma.[<out_int_raw_ch $num>].read().out_total_eof_ch_int_raw().bit();
let ret = dma.[<out_int_raw_ch $num>].read().out_total_eof().bit();

ret
}

fn set_in_burstmode(burst_mode: bool) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<in_conf0_ch $num>].modify(|_,w| {
w.[<in_data_burst_en_ch $num>]().bit(burst_mode)
.[<indscr_burst_en_ch $num>]().bit(burst_mode)
});

#[cfg(esp32s3)]
dma.[<in_conf0_ch $num>].modify(|_,w| {
w.in_data_burst_en_ch().bit(burst_mode).indscr_burst_en_ch().bit(burst_mode)
w.in_data_burst_en().bit(burst_mode).indscr_burst_en().bit(burst_mode)
});
}

fn set_in_priority(priority: DmaPriority) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<in_pri_ch $num>].write(|w| {
w.[<rx_pri_ch $num>]().variant(priority as u8)
});

#[cfg(esp32s3)]
dma.[<in_pri_ch $num>].write(|w| {
w.rx_pri_ch().variant(priority as u8)
w.rx_pri().variant(priority as u8)
});
}

Expand All @@ -190,112 +140,88 @@ macro_rules! impl_channel {

#[cfg(not(esp32s3))]
dma.[<int_clr_ch $num>].write(|w| {
w.[<in_suc_eof_ch $num _int_clr>]()
w.in_suc_eof()
.set_bit()
.[<in_err_eof_ch $num _int_clr>]()
.in_err_eof()
.set_bit()
.[<in_dscr_err_ch $num _int_clr>]()
.in_dscr_err()
.set_bit()
.[<in_dscr_empty_ch $num _int_clr>]()
.in_dscr_empty()
.set_bit()
.[<in_done_ch $num _int_clr>]()
.in_done()
.set_bit()
.[<infifo_ovf_ch $num _int_clr>]()
.infifo_ovf()
.set_bit()
.[<infifo_udf_ch $num _int_clr>]()
.infifo_udf()
.set_bit()
});

#[cfg(esp32s3)]
dma.[<in_int_clr_ch $num>].write(|w| {
w.in_suc_eof_ch_int_clr()
w.in_suc_eof()
.set_bit()
.in_err_eof_ch_int_clr()
.in_err_eof()
.set_bit()
.in_dscr_err_ch_int_clr()
.in_dscr_err()
.set_bit()
.in_dscr_empty_ch_int_clr()
.in_dscr_empty()
.set_bit()
.in_done_ch_int_clr()
.in_done()
.set_bit()
.infifo_ovf_l1_ch_int_clr()
.infifo_ovf_l1()
.set_bit()
.infifo_ovf_l3_ch_int_clr()
.infifo_ovf_l3()
.set_bit()
.infifo_udf_l1_ch_int_clr()
.infifo_udf_l1()
.set_bit()
.infifo_udf_l3_ch_int_clr()
.infifo_udf_l3()
.set_bit()
});
}

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

#[cfg(not(esp32s3))]
dma.[<in_conf0_ch $num>].modify(|_, w| w.[<in_rst_ch $num>]().set_bit());
#[cfg(not(esp32s3))]
dma.[<in_conf0_ch $num>].modify(|_, w| w.[<in_rst_ch $num>]().clear_bit());

#[cfg(esp32s3)]
dma.[<in_conf0_ch $num>].modify(|_, w| w.in_rst_ch().set_bit());
#[cfg(esp32s3)]
dma.[<in_conf0_ch $num>].modify(|_, w| w.in_rst_ch().clear_bit());
dma.[<in_conf0_ch $num>].modify(|_, w| w.in_rst().set_bit());
dma.[<in_conf0_ch $num>].modify(|_, w| w.in_rst().clear_bit());
}

fn set_in_descriptors(address: u32) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<in_link_ch $num>]
.modify(|_, w| unsafe { w.[<inlink_addr_ch $num>]().bits(address) });

#[cfg(esp32s3)]
dma.[<in_link_ch $num>].modify(|_, w| unsafe { w.inlink_addr_ch().bits(address) });
dma.[<in_link_ch $num>].modify(|_, w| unsafe { w.inlink_addr().bits(address) });
}

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

#[cfg(not(esp32s3))]
let ret = dma.[<int_raw_ch $num>].read().[<in_dscr_err_ch $num _int_raw>]().bit();

let ret = dma.[<int_raw_ch $num>].read().in_dscr_err().bit();
#[cfg(esp32s3)]
let ret = dma.[<in_int_raw_ch $num>].read().in_dscr_err_ch_int_raw().bit();
let ret = dma.[<in_int_raw_ch $num>].read().in_dscr_err().bit();

ret
}

fn set_in_peripheral(peripheral: u8) {
let dma = unsafe { &*crate::pac::DMA::PTR };

#[cfg(not(esp32s3))]
dma.[<in_peri_sel_ch $num>]
.modify(|_, w| w.[<peri_in_sel_ch $num>]().variant(peripheral));

#[cfg(esp32s3)]
dma.[<in_peri_sel_ch $num>].modify(|_, w| w.peri_in_sel_ch().variant(peripheral));
dma.[<in_peri_sel_ch $num>].modify(|_, w| w.peri_in_sel().variant(peripheral));
}

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

#[cfg(not(esp32s3))]
dma.[<in_link_ch $num>]
.modify(|_, w| w.[<inlink_start_ch $num>]().set_bit());

#[cfg(esp32s3)]
dma.[<in_link_ch $num>].modify(|_, w| w.inlink_start_ch().set_bit());
dma.[<in_link_ch $num>].modify(|_, w| w.inlink_start().set_bit());
}

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

#[cfg(not(esp32s3))]
let ret = dma.[<int_raw_ch $num>].read().[<in_suc_eof_ch $num _int_raw>]().bit();

let ret = dma.[<int_raw_ch $num>].read().in_suc_eof().bit();
#[cfg(esp32s3)]
let ret = dma.[<in_int_raw_ch $num>].read().in_suc_eof_ch_int_raw().bit();
let ret = dma.[<in_int_raw_ch $num>].read().in_suc_eof().bit();

ret
}
Expand Down