Added xQueueSendToBack, xQueueSendToFront, xQueuePeek and xSemaphoreCreateMutex - along with GenQTest.c to demonstrate their usage.

This commit is contained in:
Richard Barry 2007-08-21 16:54:48 +00:00
parent ac14fdb0b7
commit 60338bd872
18 changed files with 2005 additions and 367 deletions

View file

@ -53,13 +53,14 @@
#define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 1
#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 128 ) /* This can be made smaller if required. */
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 256 ) /* This can be made smaller if required. */
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 32 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_TRACE_FACILITY 1
#define configUSE_16_BIT_TICKS 1
#define configIDLE_SHOULD_YIELD 1
#define configUSE_CO_ROUTINES 1
#define configUSE_MUTEXES 1
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 10 )
#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )

View file

@ -119,6 +119,7 @@ Changes from V3.2.4
#include "mevents.h"
#include "crhook.h"
#include "blocktim.h"
#include "GenQTest.h"
/* Priority definitions for the tasks in the demo application. */
#define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )
@ -128,6 +129,7 @@ Changes from V3.2.4
#define mainQUEUE_BLOCK_PRIORITY ( tskIDLE_PRIORITY + 3 )
#define mainCOM_TEST_PRIORITY ( tskIDLE_PRIORITY + 2 )
#define mainSEMAPHORE_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )
#define mainGENERIC_QUEUE_PRIORITY ( tskIDLE_PRIORITY )
#define mainPRINT_STACK_SIZE ( ( unsigned portSHORT ) 512 )
#define mainDEBUG_LOG_BUFFER_SIZE ( ( unsigned portSHORT ) 20480 )
@ -176,7 +178,7 @@ portSHORT main( void )
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
vStartBlockingQueueTasks( mainQUEUE_BLOCK_PRIORITY );
vCreateBlockTimeTasks();
vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );
vStartSemaphoreTasks( mainSEMAPHORE_TASK_PRIORITY );
vStartDynamicPriorityTasks();
vStartMultiEventTasks();
@ -391,6 +393,12 @@ static portSHORT sErrorHasOccurred = pdFALSE;
sErrorHasOccurred = pdTRUE;
}
if( xAreGenericQueueTasksStillRunning() != pdTRUE )
{
vDisplayMessage( "Error in generic queue test task!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( sErrorHasOccurred == pdFALSE )
{
vDisplayMessage( "OK " );

View file

@ -15,7 +15,7 @@ WString
de6en
1
0
0
1
4
MCommand
0
@ -75,7 +75,7 @@ WVList
0
19
WPickList
50
52
20
MItem
3
@ -97,11 +97,11 @@ WCC
WString
25
d????Include directories:
1
0
26
WString
97
$(%watcom)\h;..\common\include;..\..\source\include;..\..\source\portable\owatcom\16bitdos\common
99
$(%watcom)\h;..\common\include;..\..\source\include;..\..\source\portable\owatcom\16bitdos\common;.
0
27
MCState
@ -113,7 +113,7 @@ WCC
WString
26
?????Force ANSI compliance
1
0
1
30
MCState
@ -125,7 +125,7 @@ WCC
WString
33
?????Disable stack depth checking
1
0
1
33
MVState
@ -137,11 +137,11 @@ WCC
WString
23
?????Macro definitions:
1
0
36
WString
52
OPEN_WATCOM_INDUSTRIAL_PC_PORT USE_STDIO DEBUG_BUILD
40
OPEN_WATCOM_INDUSTRIAL_PC_PORT USE_STDIO
0
37
MCState
@ -153,7 +153,7 @@ WCC
WString
34
?????Change char default to signed
1
0
1
40
MRState
@ -163,10 +163,10 @@ WString
WCC
42
WString
21
?????Compiler default
1
29
?????No debugging information
0
1
43
MRState
44
@ -175,9 +175,9 @@ WString
WCC
45
WString
21
?????Compiler default
1
28
?????Line number information
0
0
46
MRState
@ -187,22 +187,22 @@ WString
WCC
48
WString
25
?????Floating-point calls
1
1
21
?????Compiler default
0
0
49
MCState
MRState
50
WString
3
WCC
51
WString
31
???e?SS not assumed equal to DS
1
1
21
?????Compiler default
0
0
52
MRState
53
@ -211,114 +211,114 @@ WString
WCC
54
WString
9
??6??8086
1
25
?????Floating-point calls
0
1
55
MRState
MCState
56
WString
3
WCC
57
WString
10
??6??80186
1
31
???e?SS not assumed equal to DS
0
1
58
MVState
MRState
59
WString
3
WCC
60
WString
25
d????Include directories:
9
??6??8086
0
0
61
WString
99
$(%watcom)\h;..\common\include;..\..\source\include;..\..\source\portable\owatcom\16bitdos\common;.
0
MRState
62
MCState
WString
3
WCC
63
WString
3
WCC
64
WString
26
?????Force ANSI compliance
10
??6??80186
0
1
64
MVState
65
MCState
WString
3
WCC
66
WString
3
WCC
25
d????Include directories:
1
67
WString
33
?????Disable stack depth checking
97
$(%watcom)\h;..\common\include;..\..\source\include;..\..\source\portable\owatcom\16bitdos\common
0
1
68
MVState
MCState
69
WString
3
WCC
70
WString
23
?????Macro definitions:
0
26
?????Force ANSI compliance
1
1
71
WString
40
OPEN_WATCOM_INDUSTRIAL_PC_PORT USE_STDIO
0
MVState
72
MCState
73
WString
3
WCC
73
WString
23
?????Macro definitions:
1
74
WString
34
?????Change char default to signed
52
OPEN_WATCOM_INDUSTRIAL_PC_PORT USE_STDIO DEBUG_BUILD
0
1
75
MRState
MCState
76
WString
3
WCC
77
WString
29
?????No debugging information
0
34
?????Change char default to signed
1
1
78
MRState
MCState
79
WString
3
WCC
80
WString
28
?????Line number information
0
0
33
?????Disable stack depth checking
1
1
81
MRState
82
@ -329,7 +329,7 @@ WCC
WString
21
?????Compiler default
0
1
0
84
MRState
@ -341,7 +341,7 @@ WCC
WString
21
?????Compiler default
0
1
0
87
MRState
@ -353,7 +353,7 @@ WCC
WString
25
?????Floating-point calls
0
1
1
90
MCState
@ -365,7 +365,7 @@ WCC
WString
31
???e?SS not assumed equal to DS
0
1
1
93
MRState
@ -377,7 +377,7 @@ WCC
WString
9
??6??8086
0
1
0
96
MRState
@ -389,7 +389,7 @@ WCC
WString
10
??6??80186
0
1
1
99
WVList
@ -760,8 +760,8 @@ WVList
0
180
MItem
15
fileio\fileio.c
28
..\COMMON\MINIMAL\GenQTest.c
181
WString
4
@ -778,8 +778,8 @@ WVList
0
184
MItem
6
main.c
15
fileio\fileio.c
185
WString
4
@ -796,8 +796,8 @@ WVList
0
188
MItem
17
partest\partest.c
6
main.c
189
WString
4
@ -814,8 +814,8 @@ WVList
0
192
MItem
15
serial\serial.c
17
partest\partest.c
193
WString
4
@ -832,26 +832,26 @@ WVList
0
196
MItem
3
*.h
15
serial\serial.c
197
WString
3
NIL
4
COBJ
198
WVList
0
199
WVList
0
-1
20
1
1
0
0
200
MItem
31
..\..\SOURCE\INCLUDE\croutine.h
3
*.h
201
WString
3
@ -862,14 +862,14 @@ WVList
203
WVList
0
196
1
-1
1
0
0
204
MItem
27
..\..\source\include\list.h
31
..\..\SOURCE\INCLUDE\croutine.h
205
WString
3
@ -880,14 +880,14 @@ WVList
207
WVList
0
196
200
1
1
0
208
MItem
31
..\..\source\include\portable.h
27
..\..\source\include\list.h
209
WString
3
@ -898,14 +898,14 @@ WVList
211
WVList
0
196
200
1
1
0
212
MItem
31
..\..\source\include\projdefs.h
..\..\source\include\portable.h
213
WString
3
@ -916,14 +916,14 @@ WVList
215
WVList
0
196
200
1
1
0
216
MItem
28
..\..\source\include\queue.h
31
..\..\source\include\projdefs.h
217
WString
3
@ -934,14 +934,14 @@ WVList
219
WVList
0
196
200
1
1
0
220
MItem
29
..\..\source\include\semphr.h
28
..\..\source\include\queue.h
221
WString
3
@ -952,14 +952,14 @@ WVList
223
WVList
0
196
200
1
1
0
224
MItem
27
..\..\source\include\task.h
29
..\..\source\include\semphr.h
225
WString
3
@ -970,14 +970,14 @@ WVList
227
WVList
0
196
200
1
1
0
228
MItem
55
..\..\source\portable\owatcom\16bitdos\common\portasm.h
27
..\..\source\include\task.h
229
WString
3
@ -988,14 +988,14 @@ WVList
231
WVList
0
196
200
1
1
0
232
MItem
53
..\..\source\portable\owatcom\16bitdos\pc\portmacro.h
55
..\..\source\portable\owatcom\16bitdos\common\portasm.h
233
WString
3
@ -1006,14 +1006,14 @@ WVList
235
WVList
0
196
200
1
1
0
236
MItem
26
..\common\include\blockq.h
53
..\..\source\portable\owatcom\16bitdos\pc\portmacro.h
237
WString
3
@ -1024,14 +1024,14 @@ WVList
239
WVList
0
196
200
1
1
0
240
MItem
28
..\COMMON\INCLUDE\blocktim.h
26
..\common\include\blockq.h
241
WString
3
@ -1042,14 +1042,14 @@ WVList
243
WVList
0
196
200
1
1
0
244
MItem
27
..\common\include\comtest.h
28
..\COMMON\INCLUDE\blocktim.h
245
WString
3
@ -1060,14 +1060,14 @@ WVList
247
WVList
0
196
200
1
1
0
248
MItem
26
..\COMMON\INCLUDE\crhook.h
27
..\common\include\comtest.h
249
WString
3
@ -1078,14 +1078,14 @@ WVList
251
WVList
0
196
200
1
1
0
252
MItem
25
..\common\include\death.h
26
..\COMMON\INCLUDE\crhook.h
253
WString
3
@ -1096,14 +1096,14 @@ WVList
255
WVList
0
196
200
1
1
0
256
MItem
27
..\COMMON\INCLUDE\dynamic.h
25
..\common\include\death.h
257
WString
3
@ -1114,14 +1114,14 @@ WVList
259
WVList
0
196
200
1
1
0
260
MItem
26
..\common\include\fileio.h
27
..\COMMON\INCLUDE\dynamic.h
261
WString
3
@ -1132,14 +1132,14 @@ WVList
263
WVList
0
196
200
1
1
0
264
MItem
25
..\common\include\flash.h
26
..\common\include\fileio.h
265
WString
3
@ -1150,14 +1150,14 @@ WVList
267
WVList
0
196
200
1
1
0
268
MItem
24
..\common\include\flop.h
25
..\common\include\flash.h
269
WString
3
@ -1168,14 +1168,14 @@ WVList
271
WVList
0
196
200
1
1
0
272
MItem
27
..\common\include\partest.h
24
..\common\include\flop.h
273
WString
3
@ -1186,14 +1186,14 @@ WVList
275
WVList
0
196
200
1
1
0
276
MItem
25
..\common\include\pollq.h
28
..\COMMON\INCLUDE\GenQTest.h
277
WString
3
@ -1204,14 +1204,14 @@ WVList
279
WVList
0
196
200
1
1
0
280
MItem
25
..\common\include\print.h
27
..\common\include\partest.h
281
WString
3
@ -1222,14 +1222,14 @@ WVList
283
WVList
0
196
200
1
1
0
284
MItem
27
..\common\include\semtest.h
25
..\common\include\pollq.h
285
WString
3
@ -1240,14 +1240,14 @@ WVList
287
WVList
0
196
200
1
1
0
288
MItem
26
..\common\include\serial.h
25
..\common\include\print.h
289
WString
3
@ -1258,14 +1258,14 @@ WVList
291
WVList
0
196
200
1
1
0
292
MItem
16
FreeRTOSConfig.h
27
..\common\include\semtest.h
293
WString
3
@ -1276,7 +1276,43 @@ WVList
295
WVList
0
196
200
1
1
0
296
MItem
26
..\common\include\serial.h
297
WString
3
NIL
298
WVList
0
299
WVList
0
200
1
1
0
300
MItem
16
FreeRTOSConfig.h
301
WString
3
NIL
302
WVList
0
303
WVList
0
200
1
1
0

View file

@ -31,7 +31,7 @@ WRect
0
0
7168
7168
8523
0
0
9
@ -39,5 +39,5 @@ WFileName
12
rtosdemo.tgt
0
25
26
7

View file

@ -500,6 +500,7 @@ static portSHORT sComPortISR( const xComPort * const pxPort )
portSHORT sInterruptID;
portCHAR cIn, cOut;
portBASE_TYPE xTaskWokenByPost = pdFALSE, xAnotherTaskWokenByPost = pdFALSE, xTaskWokenByTx = pdFALSE;
extern void vComTestUnsuspendTask( void );
portOUTPUT_BYTE( pxPort->us8259InterruptMaskReg, ( portINPUT_BYTE( pxPort->us8259InterruptMaskReg) | ~pxPort->ucInterruptEnableMast ) );