Allow configuration set to NULL in am_ao_state_ctor()

Author: adel-mamin

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 - Fix AM_GET_MACRO_2_() documentation.
 - Relocate compiler independent macros to `common/macros.h`.
 - Allow configuration set to NULL in `am_event_state_ctor()`.
+- Allow configuration set to NULL in `am_ao_state_ctor()`.
 
 ### Added
 

apps/examples/async/main.c

@@ -307,12 +307,7 @@ static void input_task(void *param) {
 }
 
 int main(void) {
-    struct am_ao_state_cfg cfg = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     am_event_add_pool(
         m_event_pool,

apps/examples/dpp/main.c

@@ -120,12 +120,7 @@ static void ticker_task(void *param) {
 }
 
 int main(void) {
-    struct am_ao_state_cfg cfg_ao = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg_ao);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     am_event_add_pool(
         m_event_pool,

apps/examples/fork/main.c

@@ -221,12 +221,7 @@ int main(int argc, const char *argv[]) {
         return EXIT_FAILURE;
     }
 
-    struct am_ao_state_cfg cfg = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     am_ao_init_subscribe_list(m_pubsub_list, AM_COUNTOF(m_pubsub_list));
 

apps/examples/ringbuf/main.c

@@ -67,12 +67,7 @@ static void test_ringbuf_threading(void) {
 
     am_ringbuf_ctor(&g_ringbuf, buf, AM_COUNTOF(buf));
 
-    struct am_ao_state_cfg cfg_ao = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg_ao);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     ringbuf_reader_ctor();
     ringbuf_writer_ctor();

apps/examples/smokers/main.c

@@ -336,12 +336,7 @@ static void ticker_task(void *param) {
 AM_ALIGNOF_DEFINE(events_t);
 
 int main(void) {
-    struct am_ao_state_cfg cfg = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     am_event_add_pool(
         m_event_pool,

apps/examples/workers/main.c

@@ -250,12 +250,7 @@ static void ticker_task(void *param) {
 AM_ALIGNOF_DEFINE(events_t);
 
 int main(void) {
-    struct am_ao_state_cfg cfg = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     am_event_add_pool(
         m_event_pool,

libs/ao/ao.c

@@ -261,10 +261,6 @@ static void am_ao_debug_stub(const struct am_ao *ao, const struct am_event *e) {
 }
 
 void am_ao_state_ctor(const struct am_ao_state_cfg *cfg) {
-    AM_ASSERT(cfg);
-    AM_ASSERT(cfg->crit_enter);
-    AM_ASSERT(cfg->crit_exit);
-
     struct am_ao_state *me = &am_ao_state_;
     memset(me, 0, sizeof(*me));
 
@@ -274,27 +270,27 @@ void am_ao_state_ctor(const struct am_ao_state_cfg *cfg) {
 
     AM_ATOMIC_STORE_N(&me->startup_complete, false);
 
-    me->debug = cfg->debug;
+    me->debug = cfg ? cfg->debug : NULL;
     if (!me->debug) {
         me->debug = am_ao_debug_stub;
     }
-    me->crit_enter = cfg->crit_enter;
-    me->crit_exit = cfg->crit_exit;
-    me->on_idle = cfg->on_idle;
+    me->crit_enter = cfg ? cfg->crit_enter : am_pal_crit_enter;
+    me->crit_exit = cfg ? cfg->crit_exit : am_pal_crit_exit;
+    me->on_idle = cfg ? cfg->on_idle : am_pal_on_idle;
 
     me->running_ao_prio = AM_AO_PRIO_INVALID;
 
     struct am_event_state_cfg cfg_event = {
-        .crit_enter = cfg->crit_enter,
-        .crit_exit = cfg->crit_exit,
+        .crit_enter = me->crit_enter,
+        .crit_exit = me->crit_exit,
     };
     am_event_state_ctor(&cfg_event);
 
     struct am_timer_state_cfg cfg_timer = {
         .post_unsafe = (am_timer_post_unsafe_fn)am_ao_post_fifo_unsafe,
         .publish = (am_timer_publish_fn)am_ao_publish,
-        .crit_enter = cfg->crit_enter,
-        .crit_exit = cfg->crit_exit,
+        .crit_enter = me->crit_enter,
+        .crit_exit = me->crit_exit,
     };
     am_timer_state_ctor(&cfg_timer);
 }

libs/ao/ao.h

@@ -458,7 +458,7 @@ void am_ao_stop(struct am_ao *ao);
  *
  * @param cfg  active object library configuration
  *             The active object library makes an internal copy of
- *             the configuration.
+ *             the configuration. Can be NULL.
  */
 void am_ao_state_ctor(const struct am_ao_state_cfg *cfg);
 

libs/ao/tests/minimal.c

@@ -116,12 +116,7 @@ static int loopback_test_init(
 }
 
 int main(void) {
-    struct am_ao_state_cfg cfg_ao = {
-        .on_idle = am_pal_on_idle,
-        .crit_enter = am_pal_crit_enter,
-        .crit_exit = am_pal_crit_exit
-    };
-    am_ao_state_ctor(&cfg_ao);
+    am_ao_state_ctor(/*cfg=*/NULL);
 
     am_ao_ctor(&m_loopback.ao, AM_HSM_STATE_CTOR(loopback_init));
     am_ao_ctor(&m_loopback_test.ao, AM_HSM_STATE_CTOR(loopback_test_init));