diff options
Diffstat (limited to 'macros/src/codegen/shared_resources.rs')
| -rw-r--r-- | macros/src/codegen/shared_resources.rs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/macros/src/codegen/shared_resources.rs b/macros/src/codegen/shared_resources.rs index 08d77cc3..4a750070 100644 --- a/macros/src/codegen/shared_resources.rs +++ b/macros/src/codegen/shared_resources.rs @@ -118,6 +118,8 @@ pub fn codegen( let device = &extra.device; let mut uses_exceptions_with_resources = false; + let mut mask_ids = Vec::new(); + for (&priority, name) in interrupt_ids.chain(app.hardware_tasks.values().flat_map(|task| { if !util::is_exception(&task.args.binds) { Some((&task.args.priority, &task.args.binds)) @@ -147,12 +149,13 @@ pub fn codegen( })) { let v = prio_to_masks.entry(priority - 1).or_insert(Vec::new()); v.push(quote!(#device::Interrupt::#name as u32)); + mask_ids.push(quote!(#device::Interrupt::#name as u32)); } - // Call rtic::export::create_mask([u32; N]), where the array is the list of shifts + // Call rtic::export::create_mask([Mask; N]), where the array is the list of shifts let mut mask_arr = Vec::new(); - // NOTE: 0..3 assumes max 4 priority levels according to M0 spec + // NOTE: 0..3 assumes max 4 priority levels according to M0, M23 spec for i in 0..3 { let v = if let Some(v) = prio_to_masks.get(&i) { v.clone() @@ -165,18 +168,26 @@ pub fn codegen( )); } + // Generate a constant for the number of chunks needed by Mask. + let chunks_name = util::priority_mask_chunks_ident(); + mod_app.push(quote!( + #[doc(hidden)] + #[allow(non_upper_case_globals)] + const #chunks_name: usize = rtic::export::compute_mask_chunks([#(#mask_ids),*]); + )); + let masks_name = util::priority_masks_ident(); mod_app.push(quote!( #[doc(hidden)] #[allow(non_upper_case_globals)] - const #masks_name: [u32; 3] = [#(#mask_arr),*]; + const #masks_name: [rtic::export::Mask<#chunks_name>; 3] = [#(#mask_arr),*]; )); if uses_exceptions_with_resources { mod_app.push(quote!( #[doc(hidden)] #[allow(non_upper_case_globals)] - const __rtic_internal_V6_ERROR: () = rtic::export::v6_panic(); + const __rtic_internal_V6_ERROR: () = rtic::export::no_basepri_panic(); )); } |