mirror of
https://github.com/rtic-rs/rtic.git
synced 2025-12-19 06:15:45 +01:00
Don't use interrupts reserved by esp-hal
Excluding the reserved interrupts fixes the task priorities. I also considered refactoring `rtic/src/export/riscv_esp32c6.rs` to use esp-hal instead of esp32c6 directly as it has code to do all the pointer wrangling itself, but decided against it for now. It might be nice to refactor both esp implentations to use it though.
This commit is contained in:
parent
c6fbbaaae8
commit
0615841cb8
2 changed files with 16 additions and 38 deletions
|
|
@ -13,11 +13,10 @@ mod esp32c6 {
|
|||
use std::collections::HashSet;
|
||||
use syn::{parse, Attribute, Ident};
|
||||
|
||||
// Section 1.6.2 technical reference manual specifies which interrupts can be configured.
|
||||
const EXTERNAL_INTERRUPTS: [u8; 28] = [
|
||||
1, 2, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
|
||||
28, 29, 30, 31,
|
||||
];
|
||||
// esp-hal reserves interrupts 1-19:
|
||||
// https://github.com/esp-rs/esp-hal/blob/esp-hal-v1.0.0-beta.0/esp-hal/src/interrupt/riscv.rs#L200
|
||||
// https://github.com/esp-rs/esp-hal/blob/esp-hal-v1.0.0-beta.0/esp-hal/src/interrupt/riscv.rs#L725
|
||||
const EXTERNAL_INTERRUPTS: [u8; 12] = [20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31];
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn impl_mutex(
|
||||
|
|
@ -243,12 +242,9 @@ mod esp32c6 {
|
|||
)
|
||||
.zip(EXTERNAL_INTERRUPTS)
|
||||
{
|
||||
// interrupt1...interrupt19 are already defined in esp_hal
|
||||
if curr_cpu_id > 19 {
|
||||
if *name == dispatcher_name {
|
||||
let ret = &("interrupt".to_owned() + &curr_cpu_id.to_string());
|
||||
stmts.push(quote!(#[export_name = #ret]));
|
||||
}
|
||||
if *name == dispatcher_name {
|
||||
let ret = &("interrupt".to_owned() + &curr_cpu_id.to_string());
|
||||
stmts.push(quote!(#[export_name = #ret]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue