diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-09-14 17:17:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 17:17:33 +0000 |
| commit | bf9df9fe73e9c1442a7a31ae93a91e7a8288f6f3 (patch) | |
| tree | 66d1e39353d36ee64f8a47c87ed7e548f94fcc42 /macros/src/codegen | |
| parent | f46b22f797a728b0de1a6b14141c12ae1f016f8f (diff) | |
| parent | addb08607007aac915ac33984a1816a5aa353ced (diff) | |
Merge #525
525: Cleanup export and actually use rtic::export, made fn init inline r=perlindgren a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'macros/src/codegen')
| -rw-r--r-- | macros/src/codegen/init.rs | 1 | ||||
| -rw-r--r-- | macros/src/codegen/module.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index b6d3f72..2de3e73 100644 --- a/macros/src/codegen/init.rs +++ b/macros/src/codegen/init.rs @@ -77,6 +77,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult { let user_init = quote!( #(#attrs)* + #[inline(always)] #[allow(non_snake_case)] fn #name(#context: #name::Context) -> (#user_init_return) { #(#stmts)* diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 4db2c0c..17bc34d 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -275,7 +275,7 @@ pub fn codegen( ( quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(()) .enable_interrupt()), - quote!(cortex_m::peripheral::SCB::set_pendst()), + quote!(rtic::export::SCB::set_pendst()), ) } else { let rt_err = util::rt_err_ident(); |