mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #493 from rtic-rs/you-must-enable-the-rt-feature

Browse source 
backport: "you must enable the rt feature" compile time detection
This commit is contained in:
Emil Fresk 2021-07-05 20:37:08 +02:00 committed by GitHub
commit aa835e848b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
macros/src/codegen.rs
View file

@ -120,6 +120,7 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let name = &app.name;
let device = extra.device;
let rt_err = util::rt_err_ident();
quote!(
#(#user)*
@ -139,7 +140,7 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
// the user can't access the items within this `const` item
const #name: () = {
/// Always include the device crate which contains the vector table
use #device as _;
use #device as #rt_err;
#check_excess_cores

5
macros/src/codegen/pre_init.rs
View file

@ -52,6 +52,7 @@ pub fn codegen(
}
let device = extra.device;
let rt_err = util::rt_err_ident();
let nvic_prio_bits = quote!(#device::NVIC_PRIO_BITS);
// unmask interrupts and set their priorities
@ -76,14 +77,14 @@ pub fn codegen(
let interrupt = util::interrupt_ident(core, app.args.cores);
stmts.push(quote!(
core.NVIC.set_priority(
#device::#interrupt::#name,
#rt_err::#interrupt::#name,
rtic::export::logical2hw(#priority, #nvic_prio_bits),
);
));
// NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended
// interrupt is implementation defined
stmts.push(quote!(rtic::export::NVIC::unmask(#device::#interrupt::#name);));
stmts.push(quote!(rtic::export::NVIC::unmask(#rt_err::#interrupt::#name);));
}
// cross-spawn barriers: now that priorities have been set and the interrupts have been unmasked

8
macros/src/codegen/spawn_body.rs
View file

@ -10,7 +10,7 @@ pub fn codegen(
name: &Ident,
app: &App,
analysis: &Analysis,
extra: &Extra,
_extra: &Extra,
) -> TokenStream2 {
let sender = spawner.core(app);
let spawnee = &app.software_tasks[name];
@ -44,16 +44,16 @@ pub fn codegen(
)
};
let device = extra.device;
let rt_err = util::rt_err_ident();
let enum_ = util::interrupt_ident(receiver, app.args.cores);
let interrupt = &analysis.interrupts[&receiver][&priority];
let pend = if sender != receiver {
quote!(
#device::xpend(#receiver, #device::#enum_::#interrupt);
#rt_err::xpend(#receiver, #rt_err::#enum_::#interrupt);
)
} else {
quote!(
rtic::pend(#device::#enum_::#interrupt);
rtic::pend(#rt_err::#enum_::#interrupt);
)
};

6
macros/src/codegen/timer_queue.rs
View file

@ -79,7 +79,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
// Timer queue handler
{
let device = extra.device;
let rt_err = util::rt_err_ident();
let arms = timer_queue
.tasks
.iter()
@ -96,11 +96,11 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
let pend = if sender != receiver {
quote!(
#device::xpend(#receiver, #device::#enum_::#interrupt);
#rt_err::xpend(#receiver, #rt_err::#enum_::#interrupt);
)
} else {
quote!(
rtic::pend(#device::#enum_::#interrupt);
rtic::pend(#rt_err::#enum_::#interrupt);
)
};

9
macros/src/codegen/util.rs
View file

@ -109,7 +109,7 @@ pub fn instants_ident(task: &Ident, sender: Core) -> Ident {
pub fn interrupt_ident(core: Core, cores: u8) -> Ident {
let span = Span::call_site();
if cores == 1 {
Ident::new("Interrupt", span)
Ident::new("interrupt", span)
} else {
Ident::new(&format!("Interrupt_{}", core), span)
}
@ -323,3 +323,10 @@ pub fn suffixed(name: &str, core: u8) -> Ident {
pub fn tq_ident(core: Core) -> Ident {
Ident::new(&format!("TQ{}", core), Span::call_site())
}
pub fn rt_err_ident() -> Ident {
Ident::new(
"you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml",
Span::call_site(),
)
}