Skip to content

Commit f32938e

Browse files
committed
Corrected timeout handling in osThreadFlagsWait (#50)
1 parent 97bd032 commit f32938e

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

ARM.CMSIS-FreeRTOS.pdsc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
<license>License/license.txt</license>
99

1010
<releases>
11+
<release version="10.4.3-dev1">
12+
Active development:
13+
- Corrected timeout handling in osThreadFlagsWait (#50)
14+
</release>
1115
<release version="10.4.3-dev0">
1216
Active development:
1317
- Updated pack to FreeRTOS 10.4.3

CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,10 +1003,10 @@ uint32_t osThreadFlagsWait (uint32_t flags, uint32_t options, uint32_t timeout)
10031003
/* Update timeout */
10041004
td = xTaskGetTickCount() - t0;
10051005

1006-
if (td > tout) {
1006+
if (td > timeout) {
10071007
tout = 0;
10081008
} else {
1009-
tout -= td;
1009+
tout = timeout - td;
10101010
}
10111011
}
10121012
else {

DoxyGen/General/src/cmsis_freertos.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ File/Directory |Content
5656
\page cm_revisionHistory Revision History
5757

5858
<table class="cmtable" summary="Revision History">
59+
<tr>
60+
<td>10.4.3-dev1</td>
61+
<td>
62+
<p><b>Active development...</b></p>
63+
<ul>
64+
<li>Corrected timeout handling in osThreadFlagsWait (#50)</li>
65+
</ul>
66+
</p>
67+
</td>
68+
</tr>
5969
<tr>
6070
<td>10.4.3-dev0</td>
6171
<td>

0 commit comments

Comments
 (0)