Fixed bug 3219197.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2822 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-03-17 09:01:09 +00:00
parent a1427e9a22
commit 47326e33d3
3 changed files with 7 additions and 4 deletions

View File

@ -98,7 +98,7 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
--- Result: SUCCESS --- Result: SUCCESS
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--- Test Case 11.1 (Benchmark, messages #1) --- Test Case 11.1 (Benchmark, messages #1)
--- Score : 249425 msgs/S, 498850 ctxswc/S --- Score : 249426 msgs/S, 498852 ctxswc/S
--- Result: SUCCESS --- Result: SUCCESS
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--- Test Case 11.2 (Benchmark, messages #2) --- Test Case 11.2 (Benchmark, messages #2)
@ -130,7 +130,7 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
--- Result: SUCCESS --- Result: SUCCESS
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--- Test Case 11.9 (Benchmark, I/O Queues throughput) --- Test Case 11.9 (Benchmark, I/O Queues throughput)
--- Score : 474216 bytes/S --- Score : 478964 bytes/S
--- Result: SUCCESS --- Result: SUCCESS
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--- Test Case 11.10 (Benchmark, virtual timers set/reset) --- Test Case 11.10 (Benchmark, virtual timers set/reset)

View File

@ -134,7 +134,8 @@ typedef GenericQueue InputQueue;
* *
* @iclass * @iclass
*/ */
#define chIQIsFullI(iqp) ((bool_t)(chQSpaceI(iqp) >= chQSizeI(iqp))) #define chIQIsFullI(iqp) ((bool_t)(((iqp)->q_wrptr == (iqp)->q_rdptr) && \
!chIQIsEmptyI(iqp)))
/** /**
* @brief Input queue read. * @brief Input queue read.
@ -205,7 +206,8 @@ typedef GenericQueue OutputQueue;
* *
* @iclass * @iclass
*/ */
#define chOQIsEmptyI(oqp) ((bool_t)(chQSpaceI(oqp) >= chQSizeI(oqp))) #define chOQIsEmptyI(oqp) ((bool_t)(((oqp)->q_wrptr == (oqp)->q_rdptr) && \
!chOQIsFullI(oqp)))
/** /**
* @brief Evaluates to @p TRUE if the specified output queue is full. * @brief Evaluates to @p TRUE if the specified output queue is full.

View File

@ -71,6 +71,7 @@
***************************************************************************** *****************************************************************************
*** 2.3.1 *** *** 2.3.1 ***
- FIX: Fixed wrong checks in I/O Queues (bug 3219197)(backported to 2.2.3).
- FIX: Fixed invalid assertion in adcConvert() (bug 3205410)(backported - FIX: Fixed invalid assertion in adcConvert() (bug 3205410)(backported
to 2.2.3). to 2.2.3).
- NEW: Added support for PLL3 in STM32 HAL driver. Note, the format of the - NEW: Added support for PLL3 in STM32 HAL driver. Note, the format of the