itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-09-29 21:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

esp-wifi: fix unused timer result (#1633)

Browse Source
This commit is contained in:
liebman 2024-05-28 09:12:56 -07:00 committed by GitHub
parent 8aee84f842
commit 06bf505093
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
esp-wifi/src/lib.rs
View File

@ -268,7 +268,7 @@ pub fn initialize(
init_radio_clock_control(radio_clocks);
init_rng(rng);
init_tasks();
setup_timer_isr(timer);
setup_timer_isr(timer)?;
wifi_set_log_verbose();
init_clocks();
@ -314,6 +314,13 @@ pub enum InitializationError {
#[cfg(feature = "wifi")]
WifiError(WifiError),
WrongClockConfig,
Timer(hal::timer::Error),
}
impl From<hal::timer::Error> for InitializationError {
fn from(value: hal::timer::Error) -> Self {
InitializationError::Timer(value)
}
}
#[cfg(feature = "wifi")]

5
esp-wifi/src/timer/mod.rs
View File

@ -14,14 +14,15 @@ mod arch_specific;
pub use arch_specific::*;
pub use chip_specific::*;
pub fn setup_timer_isr(timebase: TimeBase) {
pub fn setup_timer_isr(timebase: TimeBase) -> Result<(), esp_hal::timer::Error> {
setup_radio_isr();
setup_timer(timebase);
setup_timer(timebase)?;
setup_multitasking();
yield_task();
Ok(())
}
#[allow(unused)]

3
esp-wifi/src/timer/riscv.rs
View File

@ -26,7 +26,7 @@ const TIMESLICE_FREQUENCY: fugit::HertzU32 = fugit::HertzU32::from_raw(crate::CO
// Time keeping
pub const TICKS_PER_SECOND: u64 = 1_000_000;
pub fn setup_timer(systimer: TimeBase) {
pub fn setup_timer(systimer: TimeBase) -> Result<(), esp_hal::timer::Error> {
// make sure the scheduling won't start before everything is setup
riscv::interrupt::disable();
@ -50,6 +50,7 @@ pub fn setup_timer(systimer: TimeBase) {
Interrupt::SYSTIMER_TARGET0,
interrupt::Priority::Priority1,
));
Ok(())
}
pub fn setup_multitasking() {

5
esp-wifi/src/timer/xtensa.rs
View File

@ -30,7 +30,7 @@ pub fn get_systimer_count() -> u64 {
esp_hal::time::current_time().ticks()
}
pub fn setup_timer(timer1: TimeBase) {
pub fn setup_timer(timer1: TimeBase) -> Result<(), esp_hal::timer::Error> {
unsafe {
interrupt::bind_interrupt(
peripherals::Interrupt::TG1_T0_LEVEL,
@ -44,11 +44,12 @@ pub fn setup_timer(timer1: TimeBase) {
));
timer1.listen();
timer1.load_value(TIMESLICE_FREQUENCY.into_duration());
timer1.load_value(TIMESLICE_FREQUENCY.into_duration())?;
timer1.start();
critical_section::with(|cs| {
TIMER1.borrow_ref_mut(cs).replace(timer1);
});
Ok(())
}
pub fn setup_multitasking() {