From 76cf14c520091d00985f845203580e14c611ed14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 27 Aug 2020 11:21:56 +0000
Subject: Brutally yank out multicore

---
 macros/src/analyze.rs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'macros/src/analyze.rs')

diff --git a/macros/src/analyze.rs b/macros/src/analyze.rs
index af6811f..c81c186 100644
--- a/macros/src/analyze.rs
+++ b/macros/src/analyze.rs
@@ -4,14 +4,14 @@ use std::collections::{BTreeMap, BTreeSet};
 use rtic_syntax::{
     analyze::{self, Priority},
     ast::App,
-    Core, P,
+    P,
 };
 use syn::Ident;
 
 /// Extend the upstream `Analysis` struct with our field
 pub struct Analysis {
     parent: P<analyze::Analysis>,
-    pub interrupts: BTreeMap<Core, BTreeMap<Priority, Ident>>,
+    pub interrupts: BTreeMap<Priority, Ident>,
 }
 
 impl ops::Deref for Analysis {
@@ -25,32 +25,24 @@ impl ops::Deref for Analysis {
 // Assign an `extern` interrupt to each priority level
 pub fn app(analysis: P<analyze::Analysis>, app: &App) -> P<Analysis> {
     let mut interrupts = BTreeMap::new();
-    for core in 0..app.args.cores {
         let priorities = app
             .software_tasks
             .values()
             .filter_map(|task| {
-                if task.args.core == core {
                     Some(task.args.priority)
-                } else {
-                    None
-                }
             })
-            .chain(analysis.timer_queues.get(&core).map(|tq| tq.priority))
+            .chain(analysis.timer_queues.first().map(|tq| tq.priority))
             .collect::<BTreeSet<_>>();
 
         if !priorities.is_empty() {
-            interrupts.insert(
-                core,
+            interrupts =
                 priorities
                     .iter()
                     .cloned()
                     .rev()
-                    .zip(app.extern_interrupts[&core].keys().cloned())
-                    .collect(),
-            );
+                    .zip(app.extern_interrupts.keys().cloned())
+                    .collect();
         }
-    }
 
     P::new(Analysis {
         parent: analysis,
-- 
cgit v1.2.3


From f151d5871c559012173356259030c1dd36a442cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 1 Sep 2020 14:39:05 +0000
Subject: Cargo fmt

---
 macros/src/analyze.rs | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'macros/src/analyze.rs')

diff --git a/macros/src/analyze.rs b/macros/src/analyze.rs
index c81c186..38018c8 100644
--- a/macros/src/analyze.rs
+++ b/macros/src/analyze.rs
@@ -25,24 +25,21 @@ impl ops::Deref for Analysis {
 // Assign an `extern` interrupt to each priority level
 pub fn app(analysis: P<analyze::Analysis>, app: &App) -> P<Analysis> {
     let mut interrupts = BTreeMap::new();
-        let priorities = app
-            .software_tasks
-            .values()
-            .filter_map(|task| {
-                    Some(task.args.priority)
-            })
-            .chain(analysis.timer_queues.first().map(|tq| tq.priority))
-            .collect::<BTreeSet<_>>();
+    let priorities = app
+        .software_tasks
+        .values()
+        .filter_map(|task| Some(task.args.priority))
+        .chain(analysis.timer_queues.first().map(|tq| tq.priority))
+        .collect::<BTreeSet<_>>();
 
-        if !priorities.is_empty() {
-            interrupts =
-                priorities
-                    .iter()
-                    .cloned()
-                    .rev()
-                    .zip(app.extern_interrupts.keys().cloned())
-                    .collect();
-        }
+    if !priorities.is_empty() {
+        interrupts = priorities
+            .iter()
+            .cloned()
+            .rev()
+            .zip(app.extern_interrupts.keys().cloned())
+            .collect();
+    }
 
     P::new(Analysis {
         parent: analysis,
-- 
cgit v1.2.3