From b8ee7d60d3f7a53ee3cfa428d5d36842ea3c8b51 Mon Sep 17 00:00:00 2001
From: Steve Heindel <stevenheindel@gmail.com>
Date: Sun, 20 Oct 2024 21:53:49 -0400
Subject: [PATCH] Fix build warning about accessing static global

---
 freertos-rust/src/hooks.rs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/freertos-rust/src/hooks.rs b/freertos-rust/src/hooks.rs
index 97b32dd..d4ccdac 100644
--- a/freertos-rust/src/hooks.rs
+++ b/freertos-rust/src/hooks.rs
@@ -2,24 +2,31 @@ use crate::base::*;
 use crate::prelude::v1::String;
 use crate::utils::*;
 
+use core::cell::OnceCell;
+
 type Callback = fn();
 
 pub struct FreeRtosHooks {
-    on_assert: Callback,
+    on_assert: OnceCell<Callback>,
 }
 
 impl FreeRtosHooks {
-    pub fn set_on_assert(&mut self, c: Callback) {
-        self.on_assert = c;
+    pub fn set_on_assert(&mut self, c: Callback) -> Result<(), Callback> {
+        self.on_assert.set(c)
     }
 
     fn do_on_assert(&self) {
-        (self.on_assert)();
+        if let Some (cb) = self.on_assert.get() {
+            cb()
+        }
     }
 }
 
-// TODO: It's unsafe to use, we should build some safe wrapper around
-pub static mut FREERTOS_HOOKS: FreeRtosHooks = FreeRtosHooks { on_assert: || {} };
+// SAFETY: must only be set before the scheduler starts and accessed after the
+// kernel has asserted, both being single threaded situations.
+unsafe impl Sync for FreeRtosHooks {}
+
+pub static FREERTOS_HOOKS: FreeRtosHooks = FreeRtosHooks { on_assert: OnceCell::new() };
 
 #[allow(unused_doc_comments)]
 #[no_mangle]
@@ -29,9 +36,7 @@ pub extern "C" fn vAssertCalled(file_name_ptr: FreeRtosCharPtr, line: FreeRtosUB
         file_name = str_from_c_string(file_name_ptr).unwrap();
     }
 
-    unsafe {
-        FREERTOS_HOOKS.do_on_assert();
-    }
+    FREERTOS_HOOKS.do_on_assert();
 
     // we can't print without std yet.
     // TODO: make the macro work for debug UART? Or use Panic here?