From 76cf14c520091d00985f845203580e14c611ed14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Thu, 27 Aug 2020 11:21:56 +0000 Subject: Brutally yank out multicore --- macros/src/codegen/module.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'macros/src/codegen/module.rs') diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 1b21209..ad20f13 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -11,12 +11,12 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> let name = ctxt.ident(app); - let core = ctxt.core(app); + //let core = ctxt.core(app); let mut needs_instant = false; let mut lt = None; match ctxt { - Context::Init(core) => { - if app.uses_schedule(core) { + Context::Init => { + if app.uses_schedule() { let m = extra.monotonic(); fields.push(quote!( @@ -37,7 +37,7 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> )); } - if extra.peripherals == Some(core) { + if extra.peripherals { let device = extra.device; fields.push(quote!( @@ -51,10 +51,10 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> values.push(quote!(core)); } - Context::Idle(..) => {} + Context::Idle => {} Context::HardwareTask(..) => { - if app.uses_schedule(core) { + if app.uses_schedule() { let m = extra.monotonic(); fields.push(quote!( @@ -69,7 +69,7 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> } Context::SoftwareTask(..) => { - if app.uses_schedule(core) { + if app.uses_schedule() { let m = extra.monotonic(); fields.push(quote!( @@ -205,7 +205,7 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> values.push(quote!(spawn: Spawn { priority })); } else { - let instant_field = if app.uses_schedule(core) { + let instant_field = if app.uses_schedule() { let m = extra.monotonic(); needs_instant = true; @@ -252,8 +252,8 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> } } - if let Context::Init(core) = ctxt { - let init = &app.inits[&core]; + if let Context::Init = ctxt { + let init = &app.inits[0]; if init.returns_late_resources { let late_resources = util::late_resources_ident(&init.name); @@ -265,14 +265,14 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> } let doc = match ctxt { - Context::Idle(_) => "Idle loop", - Context::Init(_) => "Initialization function", + Context::Idle => "Idle loop", + Context::Init => "Initialization function", Context::HardwareTask(_) => "Hardware task", Context::SoftwareTask(_) => "Software task", }; let core = if ctxt.is_init() { - if app.uses_schedule(core) { + if app.uses_schedule() { Some(quote!(core: rtic::Peripherals,)) } else { Some(quote!(core: rtic::export::Peripherals,)) @@ -312,12 +312,12 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> )); if !items.is_empty() { - let cfg_core = util::cfg_core(ctxt.core(app), app.args.cores); + //let cfg_core = util::cfg_core(ctxt.core(app), app.args.cores); quote!( #[allow(non_snake_case)] #[doc = #doc] - #cfg_core + //#cfg_core pub mod #name { #(#items)* } -- cgit v1.2.3 From d8c9476372e25799224d0225bb12c9a9fe043743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 1 Sep 2020 16:12:42 +0000 Subject: Since there only will be one init/idle use .first().unwrap(), matching rtic-syntax --- macros/src/codegen/module.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'macros/src/codegen/module.rs') diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index ad20f13..4b3d0cf 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -253,7 +253,7 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> } if let Context::Init = ctxt { - let init = &app.inits[0]; + let init = &app.inits.first().unwrap(); if init.returns_late_resources { let late_resources = util::late_resources_ident(&init.name); -- cgit v1.2.3 From d06cf91acc1126e66002f8884b1e7b7a65a9b24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 1 Sep 2020 17:04:55 +0000 Subject: Remove stale code, fix comment styling --- macros/src/codegen/module.rs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'macros/src/codegen/module.rs') diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 4b3d0cf..863f6c5 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -11,7 +11,6 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> let name = ctxt.ident(app); - //let core = ctxt.core(app); let mut needs_instant = false; let mut lt = None; match ctxt { @@ -312,12 +311,9 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) -> )); if !items.is_empty() { - //let cfg_core = util::cfg_core(ctxt.core(app), app.args.cores); - quote!( #[allow(non_snake_case)] #[doc = #doc] - //#cfg_core pub mod #name { #(#items)* } -- cgit v1.2.3