Skip to content
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

Rmt: Improve codegen for enable_listen_interrupt #2960

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Rmt: Improve codegen for enable_listen_interrupt #2960

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e8d2b
rmt: consolidate listen_interrupt() calls
wisp3rwind Jan 15, 2025
f4f901f
rmt: avoid EnumSet::iter for better codegen with optlevel=s
wisp3rwind Jan 15, 2025
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
62 changes: 34 additions & 28 deletions esp-hal/src/rmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,8 +1326,7 @@ pub trait TxChannelAsync: TxChannelInternal<Async> {
}

Self::clear_interrupts();
Self::listen_interrupt(Event::End);
Self::listen_interrupt(Event::Error);
Self::listen_interrupt(Event::End | Event::Error);
Self::send_raw(data, false, 0)?;

RmtTxFuture::new(self).await;
Expand Down Expand Up @@ -1389,8 +1388,7 @@ pub trait RxChannelAsync: RxChannelInternal<Async> {
}

Self::clear_interrupts();
Self::listen_interrupt(Event::End);
Self::listen_interrupt(Event::Error);
Self::listen_interrupt(Event::End | Event::Error);
Self::start_receive_raw();

RmtRxFuture::new(self).await;
Expand Down Expand Up @@ -1914,12 +1912,14 @@ mod chip_specific {
fn enable_listen_interrupt(events: enumset::EnumSet<$crate::rmt::Event>, enable: bool) {
let rmt = unsafe { &*crate::peripherals::RMT::PTR };
rmt.int_ena().modify(|_, w| {
for event in events {
match event {
$crate::rmt::Event::Error => w.[< ch $ch_num _tx_err >]().bit(enable),
$crate::rmt::Event::End => w.[< ch $ch_num _tx_end >]().bit(enable),
$crate::rmt::Event::Threshold => w.[< ch $ch_num _tx_thr_event >]().bit(enable),
};
if events.contains($crate::rmt::Event::Error) {
w.[< ch $ch_num _tx_err >]().bit(enable);
}
if events.contains($crate::rmt::Event::End) {
w.[< ch $ch_num _tx_end >]().bit(enable);
}
if events.contains($crate::rmt::Event::Threshold) {
w.[< ch $ch_num _tx_thr_event >]().bit(enable);
}
w
});
Expand Down Expand Up @@ -2032,12 +2032,14 @@ mod chip_specific {
fn enable_listen_interrupt(events: enumset::EnumSet<$crate::rmt::Event>, enable: bool) {
let rmt = unsafe { &*crate::peripherals::RMT::PTR };
rmt.int_ena().modify(|_, w| {
for event in events {
match event {
$crate::rmt::Event::Error => w.[< ch $ch_num _rx_err >]().bit(enable),
$crate::rmt::Event::End => w.[< ch $ch_num _rx_end >]().bit(enable),
$crate::rmt::Event::Threshold => w.[< ch $ch_num _rx_thr_event >]().bit(enable),
};
if events.contains($crate::rmt::Event::Error) {
w.[< ch $ch_num _rx_err >]().bit(enable);
}
if events.contains($crate::rmt::Event::End) {
w.[< ch $ch_num _rx_end >]().bit(enable);
}
if events.contains($crate::rmt::Event::Threshold) {
w.[< ch $ch_num _rx_thr_event >]().bit(enable);
}
w
});
Expand Down Expand Up @@ -2258,12 +2260,14 @@ mod chip_specific {
fn enable_listen_interrupt(events: enumset::EnumSet<$crate::rmt::Event>, enable: bool) {
let rmt = unsafe { &*crate::peripherals::RMT::PTR };
rmt.int_ena().modify(|_,w| {
for event in events {
match event {
$crate::rmt::Event::Error => w.[< ch $ch_num _err >]().bit(enable),
$crate::rmt::Event::End => w.[< ch $ch_num _tx_end >]().bit(enable),
$crate::rmt::Event::Threshold => w.[< ch $ch_num _tx_thr_event >]().bit(enable),
};
if events.contains($crate::rmt::Event::Error) {
w.[< ch $ch_num _err >]().bit(enable);
}
if events.contains($crate::rmt::Event::End) {
w.[< ch $ch_num _tx_end >]().bit(enable);
}
if events.contains($crate::rmt::Event::Threshold) {
w.[< ch $ch_num _tx_thr_event >]().bit(enable);
}
w
});
Expand Down Expand Up @@ -2381,12 +2385,14 @@ mod chip_specific {
fn enable_listen_interrupt(events: enumset::EnumSet<$crate::rmt::Event>, enable: bool) {
let rmt = unsafe { &*crate::peripherals::RMT::PTR };
rmt.int_ena().modify(|_, w| {
for event in events {
match event {
$crate::rmt::Event::Error => w.[< ch $ch_num _err >]().bit(enable),
$crate::rmt::Event::End => w.[< ch $ch_num _rx_end >]().bit(enable),
$crate::rmt::Event::Threshold => w.[< ch $ch_num _tx_thr_event >]().bit(enable),
};
if events.contains($crate::rmt::Event::Error) {
w.[< ch $ch_num _err >]().bit(enable);
}
if events.contains($crate::rmt::Event::End) {
w.[< ch $ch_num _rx_end >]().bit(enable);
}
if events.contains($crate::rmt::Event::Threshold) {
w.[< ch $ch_num _tx_thr_event >]().bit(enable);
}
w
});
Expand Down
Loading