diff options
| author | Peter Mitsis <peter.mitsis@windriver.com> | 2016-10-13 16:55:45 -0400 |
|---|---|---|
| committer | Benjamin Walsh <benjamin.walsh@windriver.com> | 2016-10-21 15:33:45 +0000 |
| commit | fb02d576c01a307c805c92f449944f89fd069470 (patch) | |
| tree | a9e0c5b2254e89ff94f906e3f9c0b94196a5bd42 /include | |
| parent | 4a5d62fe15b882699ba5741106337e1f15f2c745 (diff) | |
unified: Memory map APIs to use size_t
Change-Id: I035019c0cb7193400d02f493546fd3964baf073a
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel.h | 12 | ||||
| -rw-r--r-- | include/legacy.h | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/kernel.h b/include/kernel.h index 7a4993d9c..fa13bb637 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -1454,11 +1454,11 @@ extern void k_pipe_block_put(struct k_pipe *pipe, struct k_mem_block *block, struct k_mem_map { _wait_q_t wait_q; - int num_blocks; - int block_size; + uint32_t num_blocks; + size_t block_size; char *buffer; char *free_list; - int num_used; + uint32_t num_used; _DEBUG_TRACING_KERNEL_OBJECTS_NEXT_PTR(k_mem_map); }; @@ -1511,7 +1511,7 @@ struct k_mem_map { * @return N/A */ 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. @@ -1552,7 +1552,7 @@ extern void k_mem_map_free(struct k_mem_map *map, void **mem); * * @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; } @@ -1568,7 +1568,7 @@ static inline int k_mem_map_num_used_get(struct k_mem_map *map) * * @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; } diff --git a/include/legacy.h b/include/legacy.h index 4ae1469d5..6e9a129b8 100644 --- a/include/legacy.h +++ b/include/legacy.h @@ -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_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) \ K_MEM_MAP_DEFINE(_k_mem_map_obj_##name, map_block_size, \ |