diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-15 11:49:26 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-15 11:49:26 +0000 |
| commit | d603586e3302704a9a80e52ad382abcadd6d34a8 (patch) | |
| tree | 6be9571e069218a0ea214e7eb901d7e253144b7f /os/common/abstractions | |
| parent | fe3507eb99e7c411fb12c94ac38f3b689fcb7caa (diff) | |
| download | ChibiOS-d603586e3302704a9a80e52ad382abcadd6d34a8.tar.gz ChibiOS-d603586e3302704a9a80e52ad382abcadd6d34a8.tar.bz2 ChibiOS-d603586e3302704a9a80e52ad382abcadd6d34a8.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10826 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/abstractions')
| -rw-r--r-- | os/common/abstractions/cmsis_os/cmsis_os.c | 4 | ||||
| -rw-r--r-- | os/common/abstractions/nasa_cfe/osal/src/osapi.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/os/common/abstractions/cmsis_os/cmsis_os.c b/os/common/abstractions/cmsis_os/cmsis_os.c index 3af580ee0..a871b761f 100644 --- a/os/common/abstractions/cmsis_os/cmsis_os.c +++ b/os/common/abstractions/cmsis_os/cmsis_os.c @@ -510,7 +510,7 @@ osStatus osMessagePut(osMessageQId queue_id, chSysUnlockFromISR();
}
else
- msg = chMBPost((mailbox_t *)queue_id, (msg_t)info, timeout);
+ msg = chMBPostTimeout((mailbox_t *)queue_id, (msg_t)info, timeout);
return msg == MSG_OK ? osOK : osEventTimeout;
}
@@ -541,7 +541,7 @@ osEvent osMessageGet(osMessageQId queue_id, chSysUnlockFromISR();
}
else {
- msg = chMBFetch((mailbox_t *)queue_id, (msg_t*)&event.value.v, timeout);
+ msg = chMBFetchTimeout((mailbox_t *)queue_id, (msg_t*)&event.value.v, timeout);
}
/* Returned event type.*/
diff --git a/os/common/abstractions/nasa_cfe/osal/src/osapi.c b/os/common/abstractions/nasa_cfe/osal/src/osapi.c index 28088165e..5107b6f79 100644 --- a/os/common/abstractions/nasa_cfe/osal/src/osapi.c +++ b/os/common/abstractions/nasa_cfe/osal/src/osapi.c @@ -819,21 +819,21 @@ int32 OS_QueueGet(uint32 queue_id, void *data, uint32 size, /* Special time handling.*/
if (timeout == OS_PEND) {
- msgsts = chMBFetch(&oqp->mb, &msg, TIME_INFINITE);
+ msgsts = chMBFetchTimeout(&oqp->mb, &msg, TIME_INFINITE);
if (msgsts < MSG_OK) {
*size_copied = 0;
return OS_ERROR;
}
}
else if (timeout == OS_CHECK) {
- msgsts = chMBFetch(&oqp->mb, &msg, TIME_IMMEDIATE);
+ msgsts = chMBFetchTimeout(&oqp->mb, &msg, TIME_IMMEDIATE);
if (msgsts < MSG_OK) {
*size_copied = 0;
return OS_QUEUE_EMPTY;
}
}
else {
- msgsts = chMBFetch(&oqp->mb, &msg, (systime_t)timeout);
+ msgsts = chMBFetchTimeout(&oqp->mb, &msg, (systime_t)timeout);
if (msgsts < MSG_OK) {
*size_copied = 0;
return OS_QUEUE_TIMEOUT;
@@ -901,7 +901,7 @@ int32 OS_QueuePut(uint32 queue_id, void *data, uint32 size, uint32 flags) { memcpy(omsg->buf, data, size);
/* Posting the message.*/
- msgsts = chMBPost(&oqp->mb, (msg_t)omsg, TIME_INFINITE);
+ msgsts = chMBPostTimeout(&oqp->mb, (msg_t)omsg, TIME_INFINITE);
if (msgsts < MSG_OK) {
return OS_ERROR;
}
|