mirror of
https://github.com/apache/nuttx.git
synced 2025-01-13 12:08:36 +08:00
nuttx/sched/mqueue: Change 'int prio' to 'unsigned int prio'. According to open group specification, priority field in mq_* functions should have unsigned type: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/mqueue.h.html
This commit is contained in:
parent
41a4a40879
commit
626afb015b
16 changed files with 44 additions and 35 deletions
|
@ -424,7 +424,7 @@ static void *null_workerthread(pthread_addr_t pvarg)
|
||||||
FAR struct null_dev_s *priv = (struct null_dev_s *) pvarg;
|
FAR struct null_dev_s *priv = (struct null_dev_s *) pvarg;
|
||||||
struct audio_msg_s msg;
|
struct audio_msg_s msg;
|
||||||
int msglen;
|
int msglen;
|
||||||
int prio;
|
unsigned int prio;
|
||||||
|
|
||||||
audinfo("Entry\n");
|
audinfo("Entry\n");
|
||||||
|
|
||||||
|
|
|
@ -1560,7 +1560,7 @@ static void *cs43l22_workerthread(pthread_addr_t pvarg)
|
||||||
struct audio_msg_s msg;
|
struct audio_msg_s msg;
|
||||||
FAR struct ap_buffer_s *apb;
|
FAR struct ap_buffer_s *apb;
|
||||||
int msglen;
|
int msglen;
|
||||||
int prio;
|
unsigned int prio;
|
||||||
|
|
||||||
audinfo("Entry\n");
|
audinfo("Entry\n");
|
||||||
|
|
||||||
|
|
|
@ -1248,7 +1248,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
|
||||||
struct audio_msg_s msg;
|
struct audio_msg_s msg;
|
||||||
FAR struct ap_buffer_s *apb;
|
FAR struct ap_buffer_s *apb;
|
||||||
int size;
|
int size;
|
||||||
int prio;
|
unsigned int prio;
|
||||||
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
|
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
|
||||||
uint16_t reg;
|
uint16_t reg;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1151,7 +1151,7 @@ static void *wm8776_workerthread(pthread_addr_t pvarg)
|
||||||
struct audio_msg_s msg;
|
struct audio_msg_s msg;
|
||||||
FAR struct ap_buffer_s *apb;
|
FAR struct ap_buffer_s *apb;
|
||||||
int msglen;
|
int msglen;
|
||||||
int prio;
|
unsigned int prio;
|
||||||
struct mq_attr attr;
|
struct mq_attr attr;
|
||||||
|
|
||||||
audinfo("Entry\n");
|
audinfo("Entry\n");
|
||||||
|
|
|
@ -2006,7 +2006,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
|
||||||
struct audio_msg_s msg;
|
struct audio_msg_s msg;
|
||||||
FAR struct ap_buffer_s *apb;
|
FAR struct ap_buffer_s *apb;
|
||||||
int msglen;
|
int msglen;
|
||||||
int prio;
|
unsigned int prio;
|
||||||
|
|
||||||
audinfo("Entry\n");
|
audinfo("Entry\n");
|
||||||
|
|
||||||
|
|
|
@ -87,11 +87,14 @@ extern "C"
|
||||||
mqd_t mq_open(FAR const char *mq_name, int oflags, ...);
|
mqd_t mq_open(FAR const char *mq_name, int oflags, ...);
|
||||||
int mq_close(mqd_t mqdes );
|
int mq_close(mqd_t mqdes );
|
||||||
int mq_unlink(FAR const char *mq_name);
|
int mq_unlink(FAR const char *mq_name);
|
||||||
int mq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio);
|
int mq_send(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
int mq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio,
|
unsigned int prio);
|
||||||
FAR const struct timespec *abstime);
|
int mq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
ssize_t mq_receive(mqd_t mqdes, FAR char *msg, size_t msglen, FAR int *prio);
|
unsigned int prio, FAR const struct timespec *abstime);
|
||||||
ssize_t mq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, FAR int *prio,
|
ssize_t mq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
|
FAR unsigned int *prio);
|
||||||
|
ssize_t mq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
|
FAR unsigned int *prio,
|
||||||
FAR const struct timespec *abstime);
|
FAR const struct timespec *abstime);
|
||||||
int mq_notify(mqd_t mqdes, const struct sigevent *notification);
|
int mq_notify(mqd_t mqdes, const struct sigevent *notification);
|
||||||
int mq_setattr(mqd_t mqdes, FAR const struct mq_attr *mq_stat,
|
int mq_setattr(mqd_t mqdes, FAR const struct mq_attr *mq_stat,
|
||||||
|
|
|
@ -181,7 +181,8 @@ struct task_group_s; /* Forward reference */
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int nxmq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio);
|
int nxmq_send(mqd_t mqdes, FAR const char *msg, size_t msglen,\
|
||||||
|
unsigned int prio);
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: nxmq_timedsend
|
* Name: nxmq_timedsend
|
||||||
|
@ -225,8 +226,8 @@ int nxmq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio);
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio,
|
int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
FAR const struct timespec *abstime);
|
unsigned int prio, FAR const struct timespec *abstime);
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: nxmq_receive
|
* Name: nxmq_receive
|
||||||
|
@ -257,7 +258,7 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio,
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t nxmq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
ssize_t nxmq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
FAR int *prio);
|
FAR unsigned int *prio);
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: nxmq_timedreceive
|
* Name: nxmq_timedreceive
|
||||||
|
@ -293,7 +294,8 @@ ssize_t nxmq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
FAR int *prio, FAR const struct timespec *abstime);
|
FAR unsigned int *prio,
|
||||||
|
FAR const struct timespec *abstime);
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: nxmq_free_msgq
|
* Name: nxmq_free_msgq
|
||||||
|
|
|
@ -260,7 +260,7 @@ int nxmq_wait_receive(mqd_t mqdes, FAR struct mqueue_msg_s **rcvmsg)
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t nxmq_do_receive(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
ssize_t nxmq_do_receive(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
||||||
FAR char *ubuffer, int *prio)
|
FAR char *ubuffer, unsigned int *prio)
|
||||||
{
|
{
|
||||||
FAR struct tcb_s *btcb;
|
FAR struct tcb_s *btcb;
|
||||||
irqstate_t flags;
|
irqstate_t flags;
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t nxmq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
ssize_t nxmq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
FAR int *prio)
|
FAR unsigned int *prio)
|
||||||
{
|
{
|
||||||
FAR struct mqueue_msg_s *mqmsg;
|
FAR struct mqueue_msg_s *mqmsg;
|
||||||
irqstate_t flags;
|
irqstate_t flags;
|
||||||
|
@ -179,7 +179,7 @@ ssize_t nxmq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t mq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
ssize_t mq_receive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
FAR int *prio)
|
FAR unsigned int *prio)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,8 @@
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int nxmq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio)
|
int nxmq_send(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
|
unsigned int prio)
|
||||||
{
|
{
|
||||||
FAR struct mqueue_inode_s *msgq;
|
FAR struct mqueue_inode_s *msgq;
|
||||||
FAR struct mqueue_msg_s *mqmsg = NULL;
|
FAR struct mqueue_msg_s *mqmsg = NULL;
|
||||||
|
@ -207,7 +208,7 @@ int nxmq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio)
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int mq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio)
|
int mq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, unsigned int prio)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -87,11 +87,11 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int nxmq_verify_send(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
int nxmq_verify_send(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
int prio)
|
unsigned int prio)
|
||||||
{
|
{
|
||||||
/* Verify the input parameters */
|
/* Verify the input parameters */
|
||||||
|
|
||||||
if (!msg || !mqdes || prio < 0 || prio > MQ_PRIO_MAX)
|
if (msg == NULL || mqdes == NULL || prio > MQ_PRIO_MAX)
|
||||||
{
|
{
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
@ -339,7 +339,7 @@ int nxmq_wait_send(mqd_t mqdes)
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int nxmq_do_send(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
int nxmq_do_send(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
||||||
FAR const char *msg, size_t msglen, int prio)
|
FAR const char *msg, size_t msglen, unsigned int prio)
|
||||||
{
|
{
|
||||||
FAR struct tcb_s *btcb;
|
FAR struct tcb_s *btcb;
|
||||||
FAR struct mqueue_inode_s *msgq;
|
FAR struct mqueue_inode_s *msgq;
|
||||||
|
|
|
@ -151,7 +151,8 @@ static void nxmq_rcvtimeout(int argc, wdparm_t pid)
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
FAR int *prio, FAR const struct timespec *abstime)
|
FAR unsigned int *prio,
|
||||||
|
FAR const struct timespec *abstime)
|
||||||
{
|
{
|
||||||
FAR struct tcb_s *rtcb = this_task();
|
FAR struct tcb_s *rtcb = this_task();
|
||||||
FAR struct mqueue_msg_s *mqmsg;
|
FAR struct mqueue_msg_s *mqmsg;
|
||||||
|
@ -326,7 +327,8 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
ssize_t mq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
ssize_t mq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen,
|
||||||
FAR int *prio, FAR const struct timespec *abstime)
|
FAR unsigned int *prio,
|
||||||
|
FAR const struct timespec *abstime)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -157,8 +157,8 @@ static void nxmq_sndtimeout(int argc, wdparm_t pid)
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio,
|
int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
FAR const struct timespec *abstime)
|
unsigned int prio, FAR const struct timespec *abstime)
|
||||||
{
|
{
|
||||||
FAR struct tcb_s *rtcb = this_task();
|
FAR struct tcb_s *rtcb = this_task();
|
||||||
FAR struct mqueue_inode_s *msgq;
|
FAR struct mqueue_inode_s *msgq;
|
||||||
|
@ -382,8 +382,8 @@ errout_with_mqmsg:
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int mq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio,
|
int mq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
FAR const struct timespec *abstime)
|
unsigned int prio, FAR const struct timespec *abstime)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -153,15 +153,16 @@ void nxmq_wait_irq(FAR struct tcb_s *wtcb, int errcode);
|
||||||
int nxmq_verify_receive(mqd_t mqdes, FAR char *msg, size_t msglen);
|
int nxmq_verify_receive(mqd_t mqdes, FAR char *msg, size_t msglen);
|
||||||
int nxmq_wait_receive(mqd_t mqdes, FAR struct mqueue_msg_s **rcvmsg);
|
int nxmq_wait_receive(mqd_t mqdes, FAR struct mqueue_msg_s **rcvmsg);
|
||||||
ssize_t nxmq_do_receive(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
ssize_t nxmq_do_receive(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
||||||
FAR char *ubuffer, FAR int *prio);
|
FAR char *ubuffer, FAR unsigned int *prio);
|
||||||
|
|
||||||
/* mq_sndinternal.c ********************************************************/
|
/* mq_sndinternal.c ********************************************************/
|
||||||
|
|
||||||
int nxmq_verify_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio);
|
int nxmq_verify_send(mqd_t mqdes, FAR const char *msg, size_t msglen,
|
||||||
|
unsigned int prio);
|
||||||
FAR struct mqueue_msg_s *nxmq_alloc_msg(void);
|
FAR struct mqueue_msg_s *nxmq_alloc_msg(void);
|
||||||
int nxmq_wait_send(mqd_t mqdes);
|
int nxmq_wait_send(mqd_t mqdes);
|
||||||
int nxmq_do_send(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
int nxmq_do_send(mqd_t mqdes, FAR struct mqueue_msg_s *mqmsg,
|
||||||
FAR const char *msg, size_t msglen, int prio);
|
FAR const char *msg, size_t msglen, unsigned int prio);
|
||||||
|
|
||||||
/* mq_release.c ************************************************************/
|
/* mq_release.c ************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -145,7 +145,7 @@ int bt_queue_receive(mqd_t mqd, FAR struct bt_buf_s **buf)
|
||||||
} u;
|
} u;
|
||||||
|
|
||||||
ssize_t msgsize;
|
ssize_t msgsize;
|
||||||
int priority;
|
unsigned int priority;
|
||||||
|
|
||||||
DEBUGASSERT(mqd != NULL && buf != NULL);
|
DEBUGASSERT(mqd != NULL && buf != NULL);
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ int bt_queue_receive(mqd_t mqd, FAR struct bt_buf_s **buf)
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int bt_queue_send(mqd_t mqd, FAR struct bt_buf_s *buf, int priority)
|
int bt_queue_send(mqd_t mqd, FAR struct bt_buf_s *buf, unsigned int priority)
|
||||||
{
|
{
|
||||||
struct bt_bufmsg_s msg;
|
struct bt_bufmsg_s msg;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -140,6 +140,6 @@ int bt_queue_receive(mqd_t mqd, FAR struct bt_buf_s **buf);
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int bt_queue_send(mqd_t mqd, FAR struct bt_buf_s *buf, int priority);
|
int bt_queue_send(mqd_t mqd, FAR struct bt_buf_s *buf, unsigned int priority);
|
||||||
|
|
||||||
#endif /* __WIRELESS_BLUETOOTH_BT_QUEUE_H */
|
#endif /* __WIRELESS_BLUETOOTH_BT_QUEUE_H */
|
||||||
|
|
Loading…
Reference in a new issue