Add first version of alternative API.

This commit is contained in:
Richard Barry 2007-12-02 18:37:43 +00:00
parent b6d2b739f3
commit 8603259d40
17 changed files with 2308 additions and 120 deletions

View file

@ -63,6 +63,7 @@
#define configUSE_CO_ROUTINES 1
#define configUSE_MUTEXES 1
#define configUSE_COUNTING_SEMAPHORES 1
#define configUSE_ALTERNATIVE_API 1
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 10 )
#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )

View file

@ -88,9 +88,13 @@
#include "mevents.h"
#include "crhook.h"
#include "blocktim.h"
#include "AltBlock.h"
#include "GenQTest.h"
#include "QPeek.h"
#include "countsem.h"
#include "AltQTest.h"
#include "AltPollQ.h"
#include "AltBlckQ.h"
/* Priority definitions for the tasks in the demo application. */
#define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )
@ -155,7 +159,11 @@ portSHORT main( void )
vStartMultiEventTasks();
vStartQueuePeekTasks();
vStartCountingSemaphoreTasks();
vStartAltGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );
vCreateAltBlockTimeTasks();
vStartAltBlockingQueueTasks( mainQUEUE_BLOCK_PRIORITY );
vStartAltPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
/* Create the "Print" task as described at the top of the file. */
xTaskCreate( vErrorChecks, "Print", mainPRINT_STACK_SIZE, NULL, mainPRINT_TASK_PRIORITY, NULL );
@ -318,12 +326,24 @@ static portSHORT sErrorHasOccurred = pdFALSE;
sErrorHasOccurred = pdTRUE;
}
if( xAreAltBlockingQueuesStillRunning() != pdTRUE )
{
vDisplayMessage( "Alt blocking queues count unchanged!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( xArePollingQueuesStillRunning() != pdTRUE )
{
vDisplayMessage( "Polling queue count unchanged!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( xAreAltPollingQueuesStillRunning() != pdTRUE )
{
vDisplayMessage( "Alt polling queue count unchanged!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( xIsCreateTaskStillRunning() != pdTRUE )
{
vDisplayMessage( "Incorrect number of tasks running!\r\n" );
@ -366,12 +386,24 @@ static portSHORT sErrorHasOccurred = pdFALSE;
sErrorHasOccurred = pdTRUE;
}
if( xAreAltBlockTimeTestTasksStillRunning() != pdTRUE )
{
vDisplayMessage( "Error in fast block time test tasks!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( xAreGenericQueueTasksStillRunning() != pdTRUE )
{
vDisplayMessage( "Error in generic queue test task!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( xAreAltGenericQueueTasksStillRunning() != pdTRUE )
{
vDisplayMessage( "Error in fast generic queue test task!\r\n" );
sErrorHasOccurred = pdTRUE;
}
if( xAreQueuePeekTasksStillRunning() != pdTRUE )
{
vDisplayMessage( "Error in queue peek test task!\r\n" );

View file

@ -75,7 +75,7 @@ WVList
0
19
WPickList
55
63
20
MItem
3
@ -707,7 +707,7 @@ WVList
168
MItem
28
..\COMMON\MINIMAL\blocktim.c
..\COMMON\MINIMAL\AltBlckQ.c
169
WString
4
@ -725,7 +725,7 @@ WVList
172
MItem
28
..\COMMON\MINIMAL\countsem.c
..\COMMON\MINIMAL\AltBlock.c
173
WString
4
@ -742,8 +742,8 @@ WVList
0
176
MItem
27
..\COMMON\MINIMAL\crflash.c
28
..\COMMON\MINIMAL\AltPollQ.c
177
WString
4
@ -760,8 +760,8 @@ WVList
0
180
MItem
26
..\COMMON\MINIMAL\crhook.c
28
..\COMMON\MINIMAL\AltQTest.c
181
WString
4
@ -779,7 +779,7 @@ WVList
184
MItem
28
..\COMMON\MINIMAL\GenQTest.c
..\COMMON\MINIMAL\blocktim.c
185
WString
4
@ -796,8 +796,8 @@ WVList
0
188
MItem
25
..\COMMON\MINIMAL\QPeek.c
28
..\COMMON\MINIMAL\countsem.c
189
WString
4
@ -814,8 +814,8 @@ WVList
0
192
MItem
15
fileio\fileio.c
27
..\COMMON\MINIMAL\crflash.c
193
WString
4
@ -832,8 +832,8 @@ WVList
0
196
MItem
6
main.c
26
..\COMMON\MINIMAL\crhook.c
197
WString
4
@ -850,8 +850,8 @@ WVList
0
200
MItem
17
partest\partest.c
28
..\COMMON\MINIMAL\GenQTest.c
201
WString
4
@ -868,8 +868,8 @@ WVList
0
204
MItem
15
serial\serial.c
25
..\COMMON\MINIMAL\QPeek.c
205
WString
4
@ -886,80 +886,80 @@ WVList
0
208
MItem
3
*.h
15
fileio\fileio.c
209
WString
3
NIL
4
COBJ
210
WVList
0
211
WVList
0
-1
20
1
1
0
0
212
MItem
31
..\..\SOURCE\INCLUDE\croutine.h
6
main.c
213
WString
3
NIL
4
COBJ
214
WVList
0
215
WVList
0
208
20
1
1
0
216
MItem
27
..\..\source\include\list.h
17
partest\partest.c
217
WString
3
NIL
4
COBJ
218
WVList
0
219
WVList
0
208
20
1
1
0
220
MItem
31
..\..\source\include\portable.h
15
serial\serial.c
221
WString
3
NIL
4
COBJ
222
WVList
0
223
WVList
0
208
20
1
1
0
224
MItem
31
..\..\source\include\projdefs.h
3
*.h
225
WString
3
@ -970,14 +970,14 @@ WVList
227
WVList
0
208
1
-1
1
0
0
228
MItem
28
..\..\source\include\queue.h
31
..\..\SOURCE\INCLUDE\croutine.h
229
WString
3
@ -988,14 +988,14 @@ WVList
231
WVList
0
208
224
1
1
0
232
MItem
29
..\..\source\include\semphr.h
27
..\..\source\include\list.h
233
WString
3
@ -1006,14 +1006,14 @@ WVList
235
WVList
0
208
224
1
1
0
236
MItem
27
..\..\source\include\task.h
31
..\..\source\include\portable.h
237
WString
3
@ -1024,14 +1024,14 @@ WVList
239
WVList
0
208
224
1
1
0
240
MItem
55
..\..\source\portable\owatcom\16bitdos\common\portasm.h
31
..\..\source\include\projdefs.h
241
WString
3
@ -1042,14 +1042,14 @@ WVList
243
WVList
0
208
224
1
1
0
244
MItem
53
..\..\source\portable\owatcom\16bitdos\pc\portmacro.h
28
..\..\source\include\queue.h
245
WString
3
@ -1060,14 +1060,14 @@ WVList
247
WVList
0
208
224
1
1
0
248
MItem
26
..\common\include\blockq.h
29
..\..\source\include\semphr.h
249
WString
3
@ -1078,14 +1078,14 @@ WVList
251
WVList
0
208
224
1
1
0
252
MItem
28
..\COMMON\INCLUDE\blocktim.h
27
..\..\source\include\task.h
253
WString
3
@ -1096,14 +1096,14 @@ WVList
255
WVList
0
208
224
1
1
0
256
MItem
27
..\common\include\comtest.h
55
..\..\source\portable\owatcom\16bitdos\common\portasm.h
257
WString
3
@ -1114,14 +1114,14 @@ WVList
259
WVList
0
208
224
1
1
0
260
MItem
28
..\COMMON\INCLUDE\countsem.h
53
..\..\source\portable\owatcom\16bitdos\pc\portmacro.h
261
WString
3
@ -1132,14 +1132,14 @@ WVList
263
WVList
0
208
224
1
1
0
264
MItem
26
..\COMMON\INCLUDE\crhook.h
28
..\COMMON\INCLUDE\AltBlckQ.h
265
WString
3
@ -1150,14 +1150,14 @@ WVList
267
WVList
0
208
224
1
1
0
268
MItem
25
..\common\include\death.h
28
..\COMMON\INCLUDE\AltBlock.h
269
WString
3
@ -1168,14 +1168,14 @@ WVList
271
WVList
0
208
224
1
1
0
272
MItem
27
..\COMMON\INCLUDE\dynamic.h
28
..\COMMON\INCLUDE\AltPollQ.h
273
WString
3
@ -1186,14 +1186,14 @@ WVList
275
WVList
0
208
224
1
1
0
276
MItem
26
..\common\include\fileio.h
28
..\COMMON\INCLUDE\AltQTest.h
277
WString
3
@ -1204,14 +1204,14 @@ WVList
279
WVList
0
208
224
1
1
0
280
MItem
25
..\common\include\flash.h
26
..\common\include\blockq.h
281
WString
3
@ -1222,14 +1222,14 @@ WVList
283
WVList
0
208
224
1
1
0
284
MItem
24
..\common\include\flop.h
28
..\COMMON\INCLUDE\blocktim.h
285
WString
3
@ -1240,14 +1240,14 @@ WVList
287
WVList
0
208
224
1
1
0
288
MItem
28
..\COMMON\INCLUDE\GenQTest.h
27
..\common\include\comtest.h
289
WString
3
@ -1258,14 +1258,14 @@ WVList
291
WVList
0
208
224
1
1
0
292
MItem
27
..\common\include\partest.h
28
..\COMMON\INCLUDE\countsem.h
293
WString
3
@ -1276,14 +1276,14 @@ WVList
295
WVList
0
208
224
1
1
0
296
MItem
25
..\common\include\pollq.h
26
..\COMMON\INCLUDE\crhook.h
297
WString
3
@ -1294,14 +1294,14 @@ WVList
299
WVList
0
208
224
1
1
0
300
MItem
25
..\common\include\print.h
..\common\include\death.h
301
WString
3
@ -1312,14 +1312,14 @@ WVList
303
WVList
0
208
224
1
1
0
304
MItem
27
..\common\include\semtest.h
..\COMMON\INCLUDE\dynamic.h
305
WString
3
@ -1330,14 +1330,14 @@ WVList
307
WVList
0
208
224
1
1
0
308
MItem
26
..\common\include\serial.h
..\common\include\fileio.h
309
WString
3
@ -1348,14 +1348,14 @@ WVList
311
WVList
0
208
224
1
1
0
312
MItem
16
FreeRTOSConfig.h
25
..\common\include\flash.h
313
WString
3
@ -1366,7 +1366,151 @@ WVList
315
WVList
0
208
224
1
1
0
316
MItem
24
..\common\include\flop.h
317
WString
3
NIL
318
WVList
0
319
WVList
0
224
1
1
0
320
MItem
28
..\COMMON\INCLUDE\GenQTest.h
321
WString
3
NIL
322
WVList
0
323
WVList
0
224
1
1
0
324
MItem
27
..\common\include\partest.h
325
WString
3
NIL
326
WVList
0
327
WVList
0
224
1
1
0
328
MItem
25
..\common\include\pollq.h
329
WString
3
NIL
330
WVList
0
331
WVList
0
224
1
1
0
332
MItem
25
..\common\include\print.h
333
WString
3
NIL
334
WVList
0
335
WVList
0
224
1
1
0
336
MItem
27
..\common\include\semtest.h
337
WString
3
NIL
338
WVList
0
339
WVList
0
224
1
1
0
340
MItem
26
..\common\include\serial.h
341
WString
3
NIL
342
WVList
0
343
WVList
0
224
1
1
0
344
MItem
16
FreeRTOSConfig.h
345
WString
3
NIL
346
WVList
0
347
WVList
0
224
1
1
0

View file

@ -4,10 +4,10 @@ projectIdent
VpeMain
1
WRect
6
9
6229
7197
0
0
6209
7168
2
MProject
3
@ -31,7 +31,7 @@ WRect
0
0
7168
8270
8192
0
0
9
@ -39,5 +39,5 @@ WFileName
12
rtosdemo.tgt
0
25
0
7