Mirrors_Framework/libmetal
1
0
Fork 0
mirror of https://github.com/OpenAMP/libmetal.git synced 2026-09-25 11:43:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: Zephyr: replace k_mem_pool deprecated API

Browse Source 
Since Zephyr2.4.0 the k_mem_pool is deprecated and replaced by k_heap

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
This commit is contained in:
Arnaud Pouliquen
2020-12-15 12:30:56 -08:00
committed by Ed Mooring
parent 75e36524f6
commit a352cc678a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/system/zephyr/main.c
+5 -7
View File
@@ -12,14 +12,11 @@
#include <stdio.h>
#include <string.h>
#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;
}