mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-29 06:54:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #643

Browse source 
643: Fix clash with defmt r=AfoHT a=korken89

Fixes #642

Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
This commit is contained in:
bors[bot] 2022-05-24 07:14:59 +00:00 committed by GitHub
commit 5fe6350278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macros/Cargo.toml
View file

@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m-rtic-macros" name = "cortex-m-rtic-macros"
readme = "../README.md" readme = "../README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic" repository = "https://github.com/rtic-rs/cortex-m-rtic"
version = "1.1.2" version = "1.1.3"
[lib] [lib]
proc-macro = true proc-macro = true

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

@ -28,7 +28,11 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
.filter_map(|(_, task)| { .filter_map(|(_, task)| {
if !util::is_exception(&task.args.binds) { if !util::is_exception(&task.args.binds) {
let interrupt_name = &task.args.binds; let interrupt_name = &task.args.binds;
Some(quote!(assert!((#device::Interrupt::#interrupt_name as u32) < 32);)) Some(quote!(
if (#device::Interrupt::#interrupt_name as u32) > 31 {
::core::panic!("An interrupt above value 31 is used while in armv6");
}
))
} else { } else {
None None
} }

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

@ -55,7 +55,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
); );
// Compile time assert that this priority is supported by the device // Compile time assert that this priority is supported by the device
stmts.push(quote!( stmts.push(quote!(
const _: () = assert!((1 << #nvic_prio_bits) >= #priority as usize, #es); const _: () = if (1 << #nvic_prio_bits) < #priority as usize { ::core::panic!(#es); };
)); ));
stmts.push(quote!( stmts.push(quote!(
@ -84,7 +84,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
); );
// Compile time assert that this priority is supported by the device // Compile time assert that this priority is supported by the device
stmts.push(quote!( stmts.push(quote!(
const _: () = assert!((1 << #nvic_prio_bits) >= #priority as usize, #es); const _: () = if (1 << #nvic_prio_bits) < #priority as usize { ::core::panic!(#es); };
)); ));
stmts.push(quote!(core.SCB.set_priority( stmts.push(quote!(core.SCB.set_priority(
@ -109,7 +109,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
); );
// Compile time assert that this priority is supported by the device // Compile time assert that this priority is supported by the device
stmts.push(quote!( stmts.push(quote!(
const _: () = assert!((1 << #nvic_prio_bits) >= #priority as usize, #es); const _: () = if (1 << #nvic_prio_bits) < #priority as usize { ::core::panic!(#es); };
)); ));
let mono_type = &monotonic.ty; let mono_type = &monotonic.ty;

4
src/export.rs
View file

@ -66,7 +66,9 @@ impl Barrier {
} }
pub fn wait(&self) { pub fn wait(&self) {
while !self.inner.load(Ordering::Acquire) {} while !self.inner.load(Ordering::Acquire) {
core::hint::spin_loop()
}
} }
} }