Use AM_POOL_BLOCK_SIZEOF and AM_POOL_BLOCK_ALIGNMENT

Author: adel-mamin

libs/event/event.h

@@ -34,7 +34,6 @@
 #include <stdbool.h>
 
 #include "queue/queue.h"
-#include "onesize/onesize.h"
 
 #define AM_EVT_INVALID 0
 #define AM_EVT_RANGE_HSM_BEGIN 1
@@ -71,9 +70,6 @@
 #define AM_EVENT_POOL_INDEX_BITS 5
 #define AM_EVENT_POOL_INDEX_MASK ((1U << AM_EVENT_POOL_INDEX_BITS) - 1U)
 
-#define AM_EVENT_BLOCK_SIZE(t) AM_ONESIZE_BLOCK_SIZE(t)
-#define AM_EVENT_BLOCK_ALIGNMENT(a) AM_ONESIZE_BLOCK_ALIGNMENT(a)
-
 extern const int am_alignof_event;
 extern const int am_alignof_event_ptr;
 

libs/fsm/tests/event_queue.c

@@ -40,6 +40,7 @@
 #include "blk/blk.h"
 #include "event/event.h"
 #include "queue/queue.h"
+#include "onesize/onesize.h"
 #include "strlib/strlib.h"
 #include "pal/pal.h"
 #include "fsm/fsm.h"
@@ -142,14 +143,14 @@ int main(void) {
     am_event_state_ctor(&cfg);
 
     {
-        static char pool[1 * AM_EVENT_BLOCK_SIZE(struct am_event)] AM_ALIGNED(
+        static char pool[1 * AM_POOL_BLOCK_SIZEOF(struct am_event)] AM_ALIGNED(
             AM_ALIGN_MAX
         );
         am_event_add_pool(
             pool,
             (int)sizeof(pool),
-            AM_EVENT_BLOCK_SIZE(struct am_event),
-            AM_EVENT_BLOCK_ALIGNMENT(AM_ALIGNOF_EVENT)
+            AM_POOL_BLOCK_SIZEOF(struct am_event),
+            AM_POOL_BLOCK_ALIGNMENT(AM_ALIGNOF_EVENT)
         );
         AM_ASSERT(1 == am_event_get_pool_nblocks(/*index=*/0));
     }

libs/hsm/tests/defer.c

@@ -30,6 +30,7 @@
 #include "common/compiler.h"
 #include "common/macros.h"
 #include "event/event.h"
+#include "onesize/onesize.h"
 #include "strlib/strlib.h"
 #include "hsm/hsm.h"
 #include "common.h"
@@ -154,14 +155,14 @@ static void test_defer(void) {
     am_event_state_ctor(&cfg);
 
     {
-        static char pool[2 * AM_EVENT_BLOCK_SIZE(struct am_event)] AM_ALIGNED(
+        static char pool[2 * AM_POOL_BLOCK_SIZEOF(struct am_event)] AM_ALIGNED(
             AM_ALIGN_MAX
         );
         am_event_add_pool(
             pool,
             (int)sizeof(pool),
-            AM_EVENT_BLOCK_SIZE(struct am_event),
-            AM_EVENT_BLOCK_ALIGNMENT(AM_ALIGNOF_EVENT)
+            AM_POOL_BLOCK_SIZEOF(struct am_event),
+            AM_POOL_BLOCK_ALIGNMENT(AM_ALIGNOF_EVENT)
         );
         AM_ASSERT(2 == am_event_get_pool_nblocks(/*index=*/0));
     }

libs/hsm/tests/event_queue.c

@@ -40,6 +40,7 @@
 #include "blk/blk.h"
 #include "event/event.h"
 #include "queue/queue.h"
+#include "onesize/onesize.h"
 #include "strlib/strlib.h"
 #include "pal/pal.h"
 #include "hsm/hsm.h"
@@ -141,14 +142,14 @@ int main(void) {
     am_event_state_ctor(&cfg);
 
     {
-        static char pool[1 * AM_EVENT_BLOCK_SIZE(struct am_event)] AM_ALIGNED(
+        static char pool[1 * AM_POOL_BLOCK_SIZEOF(struct am_event)] AM_ALIGNED(
             AM_ALIGN_MAX
         );
         am_event_add_pool(
             pool,
             (int)sizeof(pool),
-            AM_EVENT_BLOCK_SIZE(struct am_event),
-            AM_EVENT_BLOCK_ALIGNMENT(AM_ALIGNOF_EVENT)
+            AM_POOL_BLOCK_SIZEOF(struct am_event),
+            AM_POOL_BLOCK_ALIGNMENT(AM_ALIGNOF_EVENT)
         );
         AM_ASSERT(1 == am_event_get_pool_nblocks(/*index=*/0));
     }

libs/onesize/onesize.h

@@ -34,8 +34,8 @@
 #include "blk/blk.h"
 #include "slist/slist.h"
 
-#define AM_ONESIZE_BLOCK_SIZE(t) AM_MAX(sizeof(struct am_slist), sizeof(t))
-#define AM_ONESIZE_BLOCK_ALIGNMENT(a) AM_MAX(AM_ALIGNOF_SLIST, a)
+#define AM_POOL_BLOCK_SIZEOF(t) AM_MAX(sizeof(struct am_slist), sizeof(t))
+#define AM_POOL_BLOCK_ALIGNMENT(a) AM_MAX(AM_ALIGNOF_SLIST, a)
 
 #ifdef __cplusplus
 extern "C" {