From a27943a10f7ab29be14034ac146e88cae93ab635 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen Date: Fri, 13 Oct 2023 18:48:13 +0200 Subject: [PATCH] test: Zephyr: Replace k_mem_block usage The k_mem_block structure is obsolete for some years replace it by a "void *" pointer. as done in Zephyr. Signed-off-by: Arnaud Pouliquen --- test/system/zephyr/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/system/zephyr/main.c b/test/system/zephyr/main.c index 1b5b0ef4..56600016 100644 --- a/test/system/zephyr/main.c +++ b/test/system/zephyr/main.c @@ -16,7 +16,7 @@ #define BLK_NUM_MAX 16 K_HEAP_DEFINE(kmpool, BLK_SIZE_MAX * BLK_NUM_MAX); -struct k_mem_block block[BLK_NUM_MAX]; +void *block[BLK_NUM_MAX]; extern int init_system(void); extern void metal_generic_default_poll(void); @@ -29,15 +29,15 @@ extern void metal_test_add_mutex(); extern void *metal_zephyr_allocate_memory(unsigned int size) { int i; - struct k_mem_block *blk; + void **blk; for (i = 0; i < sizeof(block)/sizeof(block[0]); i++) { blk = &block[i]; - if (!blk->data) { - blk->data = k_heap_alloc(&kmpool, size, K_NO_WAIT); - if (!blk->data) + if (!blk) { + *blk = k_heap_alloc(&kmpool, size, K_NO_WAIT); + if (!*blk) printk("Failed to alloc 0x%x memory.\n", size); - return blk->data; + return *blk; } } @@ -48,13 +48,13 @@ extern void *metal_zephyr_allocate_memory(unsigned int size) extern void metal_zephyr_free_memory(void *ptr) { int i; - struct k_mem_block *blk; + void **blk; for (i = 0; i < sizeof(block)/sizeof(block[0]); i++) { blk = &block[i]; - if (blk->data == ptr) { - k_heap_free(&kmpool, blk); - blk->data = NULL; + if (*blk == ptr) { + k_heap_free(&kmpool, *blk); + *blk = NULL; return; } }