From 96d6c7243b7b5f7f8c90dab666ded0ca0cf29c75 Mon Sep 17 00:00:00 2001
From: kalkyl <henrik.alser@me.com>
Date: Sat, 10 Dec 2022 13:43:29 +0100
Subject: [PATCH] Cleanup

---
 embassy-rp/src/multicore.rs      | 12 ++++++------
 examples/rp/src/bin/multicore.rs |  7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/embassy-rp/src/multicore.rs b/embassy-rp/src/multicore.rs
index cc5c192b..bf635db2 100644
--- a/embassy-rp/src/multicore.rs
+++ b/embassy-rp/src/multicore.rs
@@ -1,4 +1,4 @@
-//! Multicore support
+//! MultiCore support
 //!
 //! This module handles setup of the 2nd cpu core on the rp2040, which we refer to as core1.
 //! It provides functionality for setting up the stack, and starting core1.
@@ -62,9 +62,9 @@ fn core1_setup(stack_bottom: *mut usize) {
     install_stack_guard(stack_bottom);
 }
 
-/// Multicore execution management.
-pub struct Multicore {
-    cores: (Core, Core),
+/// MultiCore execution management.
+pub struct MultiCore {
+    pub cores: (Core, Core),
 }
 
 /// Data type for a properly aligned stack of N 32-bit (usize) words
@@ -81,8 +81,8 @@ impl<const SIZE: usize> Stack<SIZE> {
     }
 }
 
-impl Multicore {
-    /// Create a new |Multicore| instance.
+impl MultiCore {
+    /// Create a new |MultiCore| instance.
     pub fn new() -> Self {
         Self {
             cores: (Core { id: CoreId::Core0 }, Core { id: CoreId::Core1 }),
diff --git a/examples/rp/src/bin/multicore.rs b/examples/rp/src/bin/multicore.rs
index cfb91e21..53941da6 100644
--- a/examples/rp/src/bin/multicore.rs
+++ b/examples/rp/src/bin/multicore.rs
@@ -6,7 +6,7 @@ use defmt::*;
 use embassy_executor::Executor;
 use embassy_executor::_export::StaticCell;
 use embassy_rp::gpio::{Level, Output};
-use embassy_rp::multicore::{Multicore, Stack};
+use embassy_rp::multicore::{MultiCore, Stack};
 use embassy_rp::peripherals::PIN_25;
 use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
 use embassy_sync::channel::Channel;
@@ -28,9 +28,8 @@ fn main() -> ! {
     let p = embassy_rp::init(Default::default());
     let led = Output::new(p.PIN_25, Level::Low);
 
-    let mut mc = Multicore::new();
-    let (_, core1) = mc.cores();
-    let _ = core1.spawn(unsafe { &mut CORE1_STACK.mem }, move || {
+    let mut mc = MultiCore::new();
+    let _ = mc.cores.1.spawn(unsafe { &mut CORE1_STACK.mem }, move || {
         let executor1 = EXECUTOR1.init(Executor::new());
         executor1.run(|spawner| unwrap!(spawner.spawn(core1_task(led))));
     });