andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #695. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@8789 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2016-01-21 14:27:58 +00:00
parent 79bde6a57e
commit 92a7ba544a
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os/hal/src/hal_buffers.c
View File

@ -365,14 +365,9 @@ size_t ibqReadTimeout(input_buffers_queue_t *ibqp, uint8_t *bp,
if (ibqp->ptr == NULL) {
msg_t msg;
/* TIME_IMMEDIATE is a special case, never wait.*/
if (timeout == TIME_IMMEDIATE) {
osalSysUnlock();
return r;
}
/* TIME_INFINITE is handled differently, no deadline.*/
if (timeout == TIME_INFINITE) {
/* TIME_INFINITE and TIME_IMMEDIATE are handled differently, no
deadline.*/
if ((timeout == TIME_INFINITE) || (timeout == TIME_IMMEDIATE)) {
msg = ibqGetFullBufferTimeoutS(ibqp, timeout);
}
else {
@ -743,14 +738,9 @@ size_t obqWriteTimeout(output_buffers_queue_t *obqp, const uint8_t *bp,
if (obqp->ptr == NULL) {
msg_t msg;
/* TIME_IMMEDIATE is a special case, never wait.*/
if (timeout == TIME_IMMEDIATE) {
osalSysUnlock();
return w;
}
/* TIME_INFINITE is handled differently, no deadline.*/
if (timeout == TIME_INFINITE) {
/* TIME_INFINITE and TIME_IMMEDIATE are handled differently, no
deadline.*/
if ((timeout == TIME_INFINITE) || (timeout == TIME_IMMEDIATE)) {
msg = obqGetEmptyBufferTimeoutS(obqp, timeout);
}
else {

4
readme.txt
View File

@ -72,6 +72,10 @@
*** Releases and Change Log ***
*****************************************************************************
*** 16.1.2 ***
- HAL: Fixed incorrect handling of TIME_IMMEDIATE in the HAL buffer queues
(bug #695).
*** 16.1.1 ***
- NIL: NIL_CFG_USE_EVENTS not properly checked in NIL (bug #694).
- RT: Fixed ISR statistics are not updated from a critical zone in RT