michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: legacy: resolve conflict with MON defined in HAL

Browse source 
Some header files were defining MON and causing a conflict, so call this
something unique and avoid future conflicts.

Change-Id: If9d2553a20b3afae50a09f4c0e10733ee1cdd58d
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-02-01 22:27:21 -05:00 • committed by Anas Nashif
commit 6ca73fb744
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/legacy/kernel/test_obj_tracing/microkernel/prj.mdef
View file

@ -2,18 +2,18 @@
% TASKGROUP NAME % TASKGROUP NAME
% ============== % ==============
TASKGROUP PHI TASKGROUP DP_PHI
TASKGROUP MON TASKGROUP DP_MON
% TASK NAME PRIO ENTRY STACK GROUPS % TASK NAME PRIO ENTRY STACK GROUPS
% ================================================== % ==================================================
TASK phil_task 5 phil_demo 1024 [EXE] TASK phil_task 5 phil_demo 1024 [EXE]
TASK phi1_task0 6 phil_entry 1024 [PHI] TASK phi1_task0 6 phil_entry 1024 [DP_PHI]
TASK phil_task1 6 phil_entry 1024 [PHI] TASK phil_task1 6 phil_entry 1024 [DP_PHI]
TASK phil_task2 6 phil_entry 1024 [PHI] TASK phil_task2 6 phil_entry 1024 [DP_PHI]
TASK phil_task3 6 phil_entry 1024 [PHI] TASK phil_task3 6 phil_entry 1024 [DP_PHI]
TASK phil_task4 6 phil_entry 1024 [PHI] TASK phil_task4 6 phil_entry 1024 [DP_PHI]
TASK monitor_task 7 object_monitor 1024 [MON] TASK monitor_task 7 object_monitor 1024 [DP_MON]
% MUTEX NAME % MUTEX NAME
% ================ % ================

5
tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_task.c
View file

@ -17,6 +17,7 @@
void phil_demo(void) void phil_demo(void)
{ {
task_group_start(PHI); task_group_start(DP_PHI);
task_group_start(MON); task_group_start(DP_MON);
} }