commit d06ebe16ced776a5f71188d07ff4028452910486
author graham sanderson <graham.sanderson@raspberrypi.com> Mon Jun 20 12:21:25 2022 -0500
committer graham sanderson <graham.sanderson@raspberrypi.com> Mon Jun 20 12:21:25 2022 -0500
tree 41db41e1d5c45d0352dea27e24d5a6b3a428a54b
parent 33818dd0bd1748bad28afb2a3f85667673187cc6

fix auto_init_recursive_mutex in c++

src/common/pico_sync/include/pico/mutex.h

diff --git a/src/common/pico_sync/include/pico/mutex.h b/src/common/pico_sync/include/pico/mutex.h
index e834dc5..4f61ce2 100644
--- a/src/common/pico_sync/include/pico/mutex.h
+++ b/src/common/pico_sync/include/pico/mutex.h
@@ -289,7 +289,11 @@
  *
  * But the initialization of the mutex is performed automatically during runtime initialization
  */
+#ifdef __cplusplus
+#define auto_init_recursive_mutex(name) static __attribute__((section(".mutex_array"))) recursive_mutex_t name = { (spin_lock_t *)1 };
+#else
 #define auto_init_recursive_mutex(name) static __attribute__((section(".mutex_array"))) recursive_mutex_t name = { .core.spin_lock = (spin_lock_t *)1 /* marker for runtime_init */ }
+#endif
 
 #ifdef __cplusplus
 }

test/kitchen_sink/kitchen_sink.c

diff --git a/test/kitchen_sink/kitchen_sink.c b/test/kitchen_sink/kitchen_sink.c
index f61ece3..e007ce9 100644
--- a/test/kitchen_sink/kitchen_sink.c
+++ b/test/kitchen_sink/kitchen_sink.c
@@ -110,6 +110,9 @@
     return x * 2;
 }
 
+auto_init_mutex(mutex);
+auto_init_recursive_mutex(recursive_mutex);
+
 int main(void) {
     spiggle();
 
@@ -118,6 +121,12 @@
     printf("HI %d\n", something_inlined((int)time_us_32()));
     puts("Hello Everything!");
     puts("Hello Everything2!");
+
+    assert(mutex_try_enter(&mutex, NULL));
+    assert(!mutex_try_enter(&mutex, NULL));
+    assert(recursive_mutex_try_enter(&recursive_mutex, NULL));
+    assert(recursive_mutex_try_enter(&recursive_mutex, NULL));
     // this should compile as we are Cortex M0+
     __asm volatile("SVC #3");
+
 }