Merge pull request #239 from dimpolo/start_app_core_improvements

cpu_control::start_app_core improvements
esp-rs · Oct 31, 2022 · 9152792 · 9152792
2 parents 5aedd3e + 2f3b6c8
commit 9152792
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/esp-hal-common/src/cpu_control/esp32.rs b/esp-hal-common/src/cpu_control/esp32.rs
@@ -6,8 +6,10 @@ use xtensa_lx::set_stack_pointer;
 
 use crate::Cpu;
 
-static mut START_CORE1_FUNCTION: Option<&'static mut (dyn FnMut() -> () + 'static)> = None;
+static mut START_CORE1_FUNCTION: Option<&'static mut (dyn FnMut() + 'static)> = None;
 
+/// Will park the APP (second) core when dropped
+#[must_use]
 pub struct AppCoreGuard<'a> {
     phantom: PhantomData<&'a ()>,
 }
@@ -183,11 +185,12 @@ impl CpuControl {
     /// Start the APP (second) core
     ///
     /// The second core will start running the closure `entry`.
-    #[must_use]
-    pub fn start_app_core<'a: 'b, 'b>(
+    ///
+    /// Dropping the returned guard will park the core.
+    pub fn start_app_core(
         &mut self,
-        entry: &'a mut (dyn FnMut() -> () + 'a),
-    ) -> Result<AppCoreGuard<'b>, Error> {
+        entry: &mut (dyn FnMut() + Send),
+    ) -> Result<AppCoreGuard, Error> {
         let dport_control = crate::pac::DPORT::PTR;
         let dport_control = unsafe { &*dport_control };
 
@@ -205,7 +208,7 @@ impl CpuControl {
         self.enable_cache(Cpu::AppCpu);
 
         unsafe {
-            let entry_fn: &'static mut (dyn FnMut() -> () + 'static) = core::mem::transmute(entry);
+            let entry_fn: &'static mut (dyn FnMut() + 'static) = core::mem::transmute(entry);
             START_CORE1_FUNCTION = Some(entry_fn);
         }
 

diff --git a/esp-hal-common/src/cpu_control/esp32s3.rs b/esp-hal-common/src/cpu_control/esp32s3.rs
@@ -6,8 +6,10 @@ use xtensa_lx::set_stack_pointer;
 
 use crate::Cpu;
 
-static mut START_CORE1_FUNCTION: Option<&'static mut (dyn FnMut() -> () + 'static)> = None;
+static mut START_CORE1_FUNCTION: Option<&'static mut (dyn FnMut() + 'static)> = None;
 
+/// Will park the APP (second) core when dropped
+#[must_use]
 pub struct AppCoreGuard<'a> {
     phantom: PhantomData<&'a ()>,
 }
@@ -118,11 +120,12 @@ impl CpuControl {
     /// Start the APP (second) core
     ///
     /// The second core will start running the closure `entry`.
-    #[must_use]
-    pub fn start_app_core<'a: 'b, 'b>(
+    ///
+    /// Dropping the returned guard will park the core.
+    pub fn start_app_core(
         &mut self,
-        entry: &'a mut (dyn FnMut() -> () + 'a),
-    ) -> Result<AppCoreGuard<'b>, Error> {
+        entry: &mut (dyn FnMut() + Send),
+    ) -> Result<AppCoreGuard, Error> {
         let system_control = crate::pac::SYSTEM::PTR;
         let system_control = unsafe { &*system_control };
 
@@ -137,7 +140,7 @@ impl CpuControl {
         }
 
         unsafe {
-            let entry_fn: &'static mut (dyn FnMut() -> () + 'static) = core::mem::transmute(entry);
+            let entry_fn: &'static mut (dyn FnMut() + 'static) = core::mem::transmute(entry);
             START_CORE1_FUNCTION = Some(entry_fn);
         }