From 76cf14c520091d00985f845203580e14c611ed14 Mon Sep 17 00:00:00 2001 From: Henrik Tjäder Date: Thu, 27 Aug 2020 11:21:56 +0000 Subject: Brutally yank out multicore --- macros/src/codegen/schedule.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'macros/src/codegen/schedule.rs') diff --git a/macros/src/codegen/schedule.rs b/macros/src/codegen/schedule.rs index 728d3a09..b6cb6b9a 100644 --- a/macros/src/codegen/schedule.rs +++ b/macros/src/codegen/schedule.rs @@ -1,4 +1,4 @@ -use std::collections::{BTreeMap, HashSet}; +use std::collections::HashSet; use proc_macro2::TokenStream as TokenStream2; use quote::quote; @@ -13,14 +13,11 @@ use crate::{ pub fn codegen(app: &App, extra: &Extra) -> Vec { let mut items = vec![]; - let mut seen = BTreeMap::>::new(); + let mut seen = HashSet::<_>::new(); for (scheduler, schedulees) in app.schedule_callers() { let m = extra.monotonic(); let instant = quote!(<#m as rtic::Monotonic>::Instant); - let sender = scheduler.core(app); - let cfg_sender = util::cfg_core(sender, app.args.cores); - let seen = seen.entry(sender).or_default(); let mut methods = vec![]; for name in schedulees { @@ -35,7 +32,7 @@ pub fn codegen(app: &App, extra: &Extra) -> Vec { let body = schedule_body::codegen(scheduler, &name, app); - let section = util::link_section("text", sender); + let section = util::link_section("text"); methods.push(quote!( #(#cfgs)* #section @@ -44,7 +41,7 @@ pub fn codegen(app: &App, extra: &Extra) -> Vec { } )); } else { - let schedule = util::schedule_ident(name, sender); + let schedule = util::schedule_ident(name); if !seen.contains(name) { // generate a `schedule_${name}_S${sender}` function @@ -52,9 +49,8 @@ pub fn codegen(app: &App, extra: &Extra) -> Vec { let body = schedule_body::codegen(scheduler, &name, app); - let section = util::link_section("text", sender); + let section = util::link_section("text"); items.push(quote!( - #cfg_sender #(#cfgs)* #section unsafe fn #schedule( @@ -88,7 +84,6 @@ pub fn codegen(app: &App, extra: &Extra) -> Vec { let scheduler = scheduler.ident(app); debug_assert!(!methods.is_empty()); items.push(quote!( - #cfg_sender impl<#lt> #scheduler::Schedule<#lt> { #(#methods)* } -- cgit v1.2.3