michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: Memory map APIs to use size_t

Browse source 
Change-Id: I035019c0cb7193400d02f493546fd3964baf073a
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2016-10-13 16:55:45 -04:00 • committed by Benjamin Walsh
commit fb02d576c0
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/kernel.h
View file

@ -1454,11 +1454,11 @@ extern void k_pipe_block_put(struct k_pipe *pipe, struct k_mem_block *block,
struct k_mem_map { struct k_mem_map {
_wait_q_t wait_q; _wait_q_t wait_q;
int num_blocks; uint32_t num_blocks;
int block_size; size_t block_size;
char *buffer; char *buffer;
char *free_list; char *free_list;
int num_used; uint32_t num_used;
_DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mem_map); _DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mem_map);
}; };
@ -1511,7 +1511,7 @@ struct k_mem_map {
* @return N/A * @return N/A
*/ */
extern void k_mem_map_init(struct k_mem_map *map, void *buffer, extern void k_mem_map_init(struct k_mem_map *map, void *buffer,
int block_size, int num_blocks); size_t block_size, uint32_t num_blocks);
/** /**
* @brief Allocate a memory map block. * @brief Allocate a memory map block.
@ -1552,7 +1552,7 @@ extern void k_mem_map_free(struct k_mem_map *map, void **mem);
* *
* @return Number of used memory blocks * @return Number of used memory blocks
*/ */
static inline int k_mem_map_num_used_get(struct k_mem_map *map) static inline uint32_t k_mem_map_num_used_get(struct k_mem_map *map)
{ {
return map->num_used; return map->num_used;
} }
@ -1568,7 +1568,7 @@ static inline int k_mem_map_num_used_get(struct k_mem_map *map)
* *
* @return Number of unused memory blocks * @return Number of unused memory blocks
*/ */
static inline int k_mem_map_num_free_get(struct k_mem_map *map) static inline uint32_t k_mem_map_num_free_get(struct k_mem_map *map)
{ {
return map->num_blocks - map->num_used; return map->num_blocks - map->num_used;
} }

6
include/legacy.h
View file

@ -393,7 +393,11 @@ static inline int task_mem_map_alloc(kmemory_map_t map, void **mptr,
} }
#define task_mem_map_free k_mem_map_free #define task_mem_map_free k_mem_map_free
#define task_mem_map_used_get k_mem_map_num_used_get
static inline int task_mem_map_used_get(kmemory_map_t map)
{
return (int)k_mem_map_num_used_get(map);
}
#define DEFINE_MEM_MAP(name, map_num_blocks, map_block_size) \ #define DEFINE_MEM_MAP(name, map_num_blocks, map_block_size) \
K_MEM_MAP_DEFINE(_k_mem_map_obj_##name, map_block_size, \ K_MEM_MAP_DEFINE(_k_mem_map_obj_##name, map_block_size, \

2
kernel/unified/mem_map.c
View file

@ -70,7 +70,7 @@ static int init_mem_map_module(struct device *dev)
} }
void k_mem_map_init(struct k_mem_map *map, void *buffer, void k_mem_map_init(struct k_mem_map *map, void *buffer,
int block_size, int num_blocks) size_t block_size, uint32_t num_blocks)
{ {
map->num_blocks = num_blocks; map->num_blocks = num_blocks;
map->block_size = block_size; map->block_size = block_size;