itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-09-28 12:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow stealing the RMT channel creator + Drop bugfix (#3496)

Browse Source
This commit is contained in:
Robin Mueller 2025-05-19 10:49:41 +02:00 committed by GitHub
parent 74de9d65d6
commit 466dcc2a15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp-hal/CHANGELOG.md
View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- RMT channel creator `steal` function (#3496)
- Support for RMT extended memory (#3182)
- Support for `rand_core` 0.9 (#3211)
- `ESP_HAL_CONFIG_STACK_GUARD_OFFSET` and `ESP_HAL_CONFIG_STACK_GUARD_VALUE` to configure Rust's [Stack smashing protection](https://doc.rust-lang.org/rustc/exploit-mitigations.html#stack-smashing-protection) (#3203)
@ -65,6 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- RMT channel drop implementation bugfix where the channel was not released properly (#3496)
- RMT now uses correct max filter threshold of 255 instead of 127 (#3192)
- Full-duplex SPI works when mixed with half-duplex SPI (#3176)
- `Uart::flush_async` should no longer return prematurely (#3186)

69
esp-hal/src/rmt.rs
View File

@ -401,7 +401,7 @@ impl Default for RxChannelConfig {
}
}
pub use impl_for_chip::{ChannelCreator, Rmt};
pub use impl_for_chip::Rmt;
impl<'d, Dm> Rmt<'d, Dm>
where
@ -781,10 +781,35 @@ macro_rules! impl_rx_channel_creator {
};
}
/// RMT Channel Creator
pub struct ChannelCreator<Dm, const CHANNEL: u8>
where
Dm: crate::DriverMode,
{
phantom: PhantomData<Dm>,
_guard: GenericPeripheralGuard<{ crate::system::Peripheral::Rmt as u8 }>,
}
impl<Dm: crate::DriverMode, const CHANNEL: u8> ChannelCreator<Dm, CHANNEL> {
/// Unsafely steal a channel creator instance.
///
/// # Safety
///
/// Circumvents HAL ownership and safety guarantees and allows creating
/// multiple handles to the same peripheral structure.
pub unsafe fn steal() -> ChannelCreator<Dm, CHANNEL> {
ChannelCreator {
phantom: PhantomData,
_guard: GenericPeripheralGuard::new(),
}
}
}
#[cfg(not(any(esp32, esp32s2, esp32s3)))]
mod impl_for_chip {
use core::marker::PhantomData;
use super::ChannelCreator;
use crate::system::GenericPeripheralGuard;
/// RMT Instance
@ -832,15 +857,6 @@ mod impl_for_chip {
}
}
/// RMT Channel Creator
pub struct ChannelCreator<Dm, const CHANNEL: u8>
where
Dm: crate::DriverMode,
{
phantom: PhantomData<Dm>,
_guard: GenericPeripheralGuard<{ crate::system::Peripheral::Rmt as u8 }>,
}
impl_tx_channel_creator!(0);
impl_tx_channel_creator!(1);
@ -858,6 +874,7 @@ mod impl_for_chip {
mod impl_for_chip {
use core::marker::PhantomData;
use super::ChannelCreator;
use crate::{peripherals::RMT, system::GenericPeripheralGuard};
/// RMT Instance
@ -929,15 +946,6 @@ mod impl_for_chip {
}
}
/// RMT Channel Creator
pub struct ChannelCreator<Dm, const CHANNEL: u8>
where
Dm: crate::DriverMode,
{
phantom: PhantomData<Dm>,
_guard: GenericPeripheralGuard<{ crate::system::Peripheral::Rmt as u8 }>,
}
impl_tx_channel_creator!(0);
impl_tx_channel_creator!(1);
impl_tx_channel_creator!(2);
@ -979,6 +987,7 @@ mod impl_for_chip {
mod impl_for_chip {
use core::marker::PhantomData;
use super::ChannelCreator;
use crate::{peripherals::RMT, system::GenericPeripheralGuard};
/// RMT Instance
@ -1026,15 +1035,6 @@ mod impl_for_chip {
}
}
/// RMT Channel Creator
pub struct ChannelCreator<Dm, const CHANNEL: u8>
where
Dm: crate::DriverMode,
{
phantom: PhantomData<Dm>,
_guard: GenericPeripheralGuard<{ crate::system::Peripheral::Rmt as u8 }>,
}
impl_tx_channel_creator!(0);
impl_tx_channel_creator!(1);
impl_tx_channel_creator!(2);
@ -1060,6 +1060,7 @@ mod impl_for_chip {
mod impl_for_chip {
use core::marker::PhantomData;
use super::ChannelCreator;
use crate::{peripherals::RMT, system::GenericPeripheralGuard};
/// RMT Instance
@ -1131,15 +1132,6 @@ mod impl_for_chip {
}
}
/// RMT Channel Creator
pub struct ChannelCreator<Dm, const CHANNEL: u8>
where
Dm: crate::DriverMode,
{
phantom: PhantomData<Dm>,
_guard: GenericPeripheralGuard<{ crate::system::Peripheral::Rmt as u8 }>,
}
impl_tx_channel_creator!(0);
impl_tx_channel_creator!(1);
impl_tx_channel_creator!(2);
@ -1177,11 +1169,12 @@ where
Dm: crate::DriverMode,
{
fn drop(&mut self) {
let memsize = chip_specific::channel_mem_size(CHANNEL);
// This isn't really necessary, but be extra sure that this channel can't
// interfere with others.
chip_specific::set_channel_mem_size(CHANNEL, 0);
let memsize = chip_specific::channel_mem_size(CHANNEL);
for s in STATE[usize::from(CHANNEL)..usize::from(CHANNEL + memsize)]
.iter()
.rev()