From a352cc678a33f31c80cae1595a0ca90d8aa50c28 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen Date: Thu, 10 Dec 2020 18:03:07 +0100 Subject: [PATCH] test: Zephyr: replace k_mem_pool deprecated API Since Zephyr2.4.0 the k_mem_pool is deprecated and replaced by k_heap Signed-off-by: Arnaud Pouliquen --- test/system/zephyr/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/system/zephyr/main.c b/test/system/zephyr/main.c index 745899c..e92b53b 100644 --- a/test/system/zephyr/main.c +++ b/test/system/zephyr/main.c @@ -12,14 +12,11 @@ #include #include -#define BLK_SIZE_MIN 128 #define BLK_SIZE_MAX 1024 -#define BLK_NUM_MIN 64 #define BLK_NUM_MAX 16 -#define BLK_ALIGN BLK_SIZE_MIN -K_MEM_POOL_DEFINE(kmpool, BLK_SIZE_MIN, BLK_SIZE_MAX, BLK_NUM_MAX, BLK_ALIGN); -struct k_mem_block block[BLK_NUM_MIN]; +K_HEAP_DEFINE(kmpool, BLK_SIZE_MAX * BLK_NUM_MAX); +struct k_mem_block block[BLK_NUM_MAX]; extern int init_system(void); extern void metal_generic_default_poll(void); @@ -37,7 +34,8 @@ extern void *metal_zephyr_allocate_memory(unsigned int size) for (i = 0; i < sizeof(block)/sizeof(block[0]); i++) { blk = &block[i]; if (!blk->data) { - if (k_mem_pool_alloc(&kmpool, blk,size, K_NO_WAIT)) + blk->data = k_heap_alloc(&kmpool, size, K_NO_WAIT); + if (!blk->data) printk("Failed to alloc 0x%x memory.\n", size); return blk->data; } @@ -55,7 +53,7 @@ extern void metal_zephyr_free_memory(void *ptr) for (i = 0; i < sizeof(block)/sizeof(block[0]); i++) { blk = &block[i]; if (blk->data == ptr) { - k_mem_pool_free(blk); + k_heap_free(&kmpool, blk); blk->data = NULL; return; }