michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: msgqs to use size_t

Browse source 
Change-Id: I9bedf22a052990395a1f83417c533b197b31987a
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2016-10-13 11:41:45 -04:00
commit 026b4ed4e2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/kernel.h
View file

@ -1019,7 +1019,7 @@ extern void k_event_send(struct k_event *event);
struct k_msgq { struct k_msgq {
_wait_q_t wait_q; _wait_q_t wait_q;
uint32_t msg_size; size_t msg_size;
uint32_t max_msgs; uint32_t max_msgs;
char *buffer_start; char *buffer_start;
char *buffer_end; char *buffer_end;
@ -1076,7 +1076,7 @@ struct k_msgq {
* @return N/A * @return N/A
*/ */
extern void k_msgq_init(struct k_msgq *q, char *buffer, extern void k_msgq_init(struct k_msgq *q, char *buffer,
uint32_t msg_size, uint32_t max_msgs); size_t msg_size, uint32_t max_msgs);
/** /**
* @brief Add a message to a message queue. * @brief Add a message to a message queue.
@ -1135,7 +1135,7 @@ extern void k_msgq_purge(struct k_msgq *q);
* *
* @return Number of unused messages * @return Number of unused messages
*/ */
static inline int k_msgq_num_free_get(struct k_msgq *q) static inline uint32_t k_msgq_num_free_get(struct k_msgq *q)
{ {
return q->max_msgs - q->used_msgs; return q->max_msgs - q->used_msgs;
} }
@ -1147,7 +1147,7 @@ static inline int k_msgq_num_free_get(struct k_msgq *q)
* *
* @return Number of used messages * @return Number of used messages
*/ */
static inline int k_msgq_num_used_get(struct k_msgq *q) static inline uint32_t k_msgq_num_used_get(struct k_msgq *q)
{ {
return q->used_msgs; return q->used_msgs;
} }

2
kernel/unified/msg_q.c
View file

@ -30,7 +30,7 @@
#include <misc/dlist.h> #include <misc/dlist.h>
void k_msgq_init(struct k_msgq *q, char *buffer, void k_msgq_init(struct k_msgq *q, char *buffer,
uint32_t msg_size, uint32_t max_msgs) size_t msg_size, uint32_t max_msgs)
{ {
q->msg_size = msg_size; q->msg_size = msg_size;
q->max_msgs = max_msgs; q->max_msgs = max_msgs;