diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2021-07-20 08:51:53 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-07-20 08:51:53 +0000 |
| commit | 78f556f9427e94e830b6ff6269bb1ac80010c5e6 (patch) | |
| tree | 9db41cca23a87a9d78369c14b311d7fda9309fc0 /macros/src/codegen/software_tasks.rs | |
| parent | c67657371b9f27353caae8a8ccf6e94cd0f25110 (diff) | |
| parent | bf80035aef21dd9c84a26ed47bbd1bb4a596952f (diff) | |
| download | rtic-78f556f9427e94e830b6ff6269bb1ac80010c5e6.tar.gz rtic-78f556f9427e94e830b6ff6269bb1ac80010c5e6.tar.zst rtic-78f556f9427e94e830b6ff6269bb1ac80010c5e6.zip | |
Merge #464
464: const generics r=AfoHT a=burrbull
Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>
Co-authored-by: mriise <mark.riise26@gmail.com>
Co-authored-by: Zgarbul Andrey <zgarbul.andrey@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | macros/src/codegen/software_tasks.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs index cfd21e40..0b073359 100644 --- a/macros/src/codegen/software_tasks.rs +++ b/macros/src/codegen/software_tasks.rs @@ -32,8 +32,8 @@ pub fn codegen( let (_, _, _, input_ty) = util::regroup_inputs(inputs); let cap = task.args.capacity; - let cap_lit = util::capacity_literal(cap); - let cap_ty = util::capacity_typenum(cap, true); + let cap_lit = util::capacity_literal(cap as usize); + let cap_lit_p1 = util::capacity_literal(cap as usize + 1); // Create free queues and inputs / instants buffers let fq = util::fq_ident(name); @@ -41,10 +41,8 @@ pub fn codegen( let (fq_ty, fq_expr, mk_uninit): (_, _, Box<dyn Fn() -> Option<_>>) = { ( - quote!(rtic::export::SCFQ<#cap_ty>), - quote!(rtic::export::Queue(unsafe { - rtic::export::iQueue::u8_sc() - })), + quote!(rtic::export::SCFQ<#cap_lit_p1>), + quote!(rtic::export::Queue::new()), Box::new(|| util::link_section_uninit()), ) }; |