diff options
Diffstat (limited to 'Source/queue.c')
| -rw-r--r-- | Source/queue.c | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/Source/queue.c b/Source/queue.c index d4e0b819..436af98a 100644 --- a/Source/queue.c +++ b/Source/queue.c @@ -1,41 +1,40 @@ /*
- FreeRTOS.org V5.1.2 - Copyright (C) 2003-2009 Richard Barry.
+ FreeRTOS.org V5.2.0 - Copyright (C) 2003-2009 Richard Barry.
This file is part of the FreeRTOS.org distribution.
- FreeRTOS.org is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ FreeRTOS.org is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License (version 2) as published
+ by the Free Software Foundation and modified by the FreeRTOS exception.
- FreeRTOS.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ FreeRTOS.org is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
- You should have received a copy of the GNU General Public License
- along with FreeRTOS.org; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License along
+ with FreeRTOS.org; if not, write to the Free Software Foundation, Inc., 59
+ Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- A special exception to the GPL can be applied should you wish to distribute
- a combined work that includes FreeRTOS.org, without being obliged to provide
+ A special exception to the GPL is included to allow you to distribute a
+ combined work that includes FreeRTOS.org without being obliged to provide
the source code for any proprietary components. See the licensing section
- of http://www.FreeRTOS.org for full details of how and when the exception
- can be applied.
+ of http://www.FreeRTOS.org for full details.
- ***************************************************************************
- ***************************************************************************
- * *
- * Get the FreeRTOS eBook! See http://www.FreeRTOS.org/Documentation *
+
+ ***************************************************************************
+ * *
+ * Get the FreeRTOS eBook! See http://www.FreeRTOS.org/Documentation *
* *
* This is a concise, step by step, 'hands on' guide that describes both *
* general multitasking concepts and FreeRTOS specifics. It presents and *
* explains numerous examples that are written using the FreeRTOS API. *
* Full source code for all the examples is provided in an accompanying *
* .zip file. *
- * *
- ***************************************************************************
- ***************************************************************************
+ * *
+ ***************************************************************************
+
+ 1 tab == 4 spaces!
Please ensure to read the configuration and relevant port sections of the
online documentation.
@@ -484,6 +483,7 @@ xTimeOutType xTimeOut; /* The queue was full and no block time is specified (or
the block time has expired) so leave now. */
taskEXIT_CRITICAL();
+ traceQUEUE_SEND_FAILED( pxQueue );
return errQUEUE_FULL;
}
else if( xEntryTimeSet == pdFALSE )
@@ -540,6 +540,7 @@ xTimeOutType xTimeOut; /* The timeout has expired. */
prvUnlockQueue( pxQueue );
( void ) xTaskResumeAll();
+ traceQUEUE_SEND_FAILED( pxQueue );
return errQUEUE_FULL;
}
}
@@ -609,6 +610,7 @@ xTimeOutType xTimeOut; else
{
taskEXIT_CRITICAL();
+ traceQUEUE_SEND_FAILED( pxQueue );
return errQUEUE_FULL;
}
}
@@ -695,6 +697,7 @@ xTimeOutType xTimeOut; if( xTicksToWait == ( portTickType ) 0 )
{
taskEXIT_CRITICAL();
+ traceQUEUE_RECEIVE_FAILED( pxQueue );
return errQUEUE_EMPTY;
}
else if( xEntryTimeSet == pdFALSE )
@@ -732,6 +735,7 @@ xTimeOutType xTimeOut; else
{
taskEXIT_CRITICAL();
+ traceQUEUE_RECEIVE_FAILED( pxQueue );
return errQUEUE_EMPTY;
}
}
@@ -878,6 +882,7 @@ signed portCHAR *pcOriginalReadPosition; /* The queue was empty and no block time is specified (or
the block time has expired) so leave now. */
taskEXIT_CRITICAL();
+ traceQUEUE_RECEIVE_FAILED( pxQueue );
return errQUEUE_EMPTY;
}
else if( xEntryTimeSet == pdFALSE )
@@ -935,6 +940,7 @@ signed portCHAR *pcOriginalReadPosition; {
prvUnlockQueue( pxQueue );
( void ) xTaskResumeAll();
+ traceQUEUE_RECEIVE_FAILED( pxQueue );
return errQUEUE_EMPTY;
}
}
|