From 6fadb7af092edc2caab1c34d004341ea784989f7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Mar 2018 06:33:24 +0100 Subject: config: Use new scheduler configuration defines Update #3325. --- testsuites/smptests/smpclock01/init.c | 12 +-- testsuites/smptests/smpfatal04/init.c | 4 +- testsuites/smptests/smpfatal05/init.c | 8 +- testsuites/smptests/smpfatal08/init.c | 8 +- testsuites/smptests/smpmigration02/init.c | 136 +++++++++++++++--------------- testsuites/smptests/smpmrsp01/init.c | 76 ++++++++--------- testsuites/smptests/smpmutex01/init.c | 12 +-- testsuites/smptests/smpmutex02/init.c | 136 +++++++++++++++--------------- testsuites/smptests/smppsxmutex01/init.c | 12 +-- testsuites/smptests/smpschededf01/init.c | 8 +- testsuites/smptests/smpscheduler02/init.c | 16 ++-- testsuites/smptests/smpscheduler03/init.c | 8 +- testsuites/smptests/smpscheduler04/init.c | 136 +++++++++++++++--------------- testsuites/smptests/smpscheduler05/init.c | 8 +- testsuites/smptests/smpscheduler06/init.c | 8 +- testsuites/smptests/smpscheduler07/init.c | 8 +- testsuites/smptests/smpwakeafter01/init.c | 12 +-- 17 files changed, 304 insertions(+), 304 deletions(-) (limited to 'testsuites/smptests') diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c index 8e0d93063c..ecfab36b9b 100644 --- a/testsuites/smptests/smpclock01/init.c +++ b/testsuites/smptests/smpclock01/init.c @@ -180,14 +180,14 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(b); +RTEMS_SCHEDULER_SIMPLE_SMP(a); +RTEMS_SCHEDULER_SIMPLE_SMP(b); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, SCHEDULER_A), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(b, SCHEDULER_B) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, SCHEDULER_A), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(b, SCHEDULER_B) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL) diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c index 5599e790c4..d2da96409f 100644 --- a/testsuites/smptests/smpfatal04/init.c +++ b/testsuites/smptests/smpfatal04/init.c @@ -61,9 +61,9 @@ static void fatal_extension( { .fatal = fatal_extension }, \ RTEMS_TEST_INITIAL_EXTENSION -#define CONFIGURE_SCHEDULER_CONTROLS +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER +#define CONFIGURE_SCHEDULER_ASSIGNMENTS RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER #define CONFIGURE_MAXIMUM_TASKS 1 diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c index b850f922e4..c64c515c11 100644 --- a/testsuites/smptests/smpfatal05/init.c +++ b/testsuites/smptests/smpfatal05/init.c @@ -62,15 +62,15 @@ static void fatal_extension( #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a); +RTEMS_SCHEDULER_SIMPLE_SMP(a); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P')) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P')) #define ASSIGN \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, \ ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, \ ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, \ diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c index b4400136bb..83a82dab75 100644 --- a/testsuites/smptests/smpfatal08/init.c +++ b/testsuites/smptests/smpfatal08/init.c @@ -118,12 +118,12 @@ static void fatal_extension( #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a); +RTEMS_SCHEDULER_SIMPLE_SMP(a); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P')) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P')) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c index 2a022d7dea..74088dd95b 100644 --- a/testsuites/smptests/smpmigration02/init.c +++ b/testsuites/smptests/smpmigration02/init.c @@ -287,74 +287,74 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31); - -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31) - -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +RTEMS_SCHEDULER_SIMPLE_SMP(0); +RTEMS_SCHEDULER_SIMPLE_SMP(1); +RTEMS_SCHEDULER_SIMPLE_SMP(2); +RTEMS_SCHEDULER_SIMPLE_SMP(3); +RTEMS_SCHEDULER_SIMPLE_SMP(4); +RTEMS_SCHEDULER_SIMPLE_SMP(5); +RTEMS_SCHEDULER_SIMPLE_SMP(6); +RTEMS_SCHEDULER_SIMPLE_SMP(7); +RTEMS_SCHEDULER_SIMPLE_SMP(8); +RTEMS_SCHEDULER_SIMPLE_SMP(9); +RTEMS_SCHEDULER_SIMPLE_SMP(10); +RTEMS_SCHEDULER_SIMPLE_SMP(11); +RTEMS_SCHEDULER_SIMPLE_SMP(12); +RTEMS_SCHEDULER_SIMPLE_SMP(13); +RTEMS_SCHEDULER_SIMPLE_SMP(14); +RTEMS_SCHEDULER_SIMPLE_SMP(15); +RTEMS_SCHEDULER_SIMPLE_SMP(16); +RTEMS_SCHEDULER_SIMPLE_SMP(17); +RTEMS_SCHEDULER_SIMPLE_SMP(18); +RTEMS_SCHEDULER_SIMPLE_SMP(19); +RTEMS_SCHEDULER_SIMPLE_SMP(20); +RTEMS_SCHEDULER_SIMPLE_SMP(21); +RTEMS_SCHEDULER_SIMPLE_SMP(22); +RTEMS_SCHEDULER_SIMPLE_SMP(23); +RTEMS_SCHEDULER_SIMPLE_SMP(24); +RTEMS_SCHEDULER_SIMPLE_SMP(25); +RTEMS_SCHEDULER_SIMPLE_SMP(26); +RTEMS_SCHEDULER_SIMPLE_SMP(27); +RTEMS_SCHEDULER_SIMPLE_SMP(28); +RTEMS_SCHEDULER_SIMPLE_SMP(29); +RTEMS_SCHEDULER_SIMPLE_SMP(30); +RTEMS_SCHEDULER_SIMPLE_SMP(31); + +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(17, 17), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(18, 18), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(19, 19), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(20, 20), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(21, 21), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(22, 22), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(23, 23), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(24, 24), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(25, 25), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(26, 26), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(27, 27), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(28, 28), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(29, 29), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(30, 30), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(31, 31) + +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN(2, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c index b81877114f..4d4e6350e2 100644 --- a/testsuites/smptests/smpmrsp01/init.c +++ b/testsuites/smptests/smpmrsp01/init.c @@ -1786,44 +1786,44 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16); - -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16) - -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +RTEMS_SCHEDULER_SIMPLE_SMP(0); +RTEMS_SCHEDULER_SIMPLE_SMP(1); +RTEMS_SCHEDULER_SIMPLE_SMP(2); +RTEMS_SCHEDULER_SIMPLE_SMP(3); +RTEMS_SCHEDULER_SIMPLE_SMP(4); +RTEMS_SCHEDULER_SIMPLE_SMP(5); +RTEMS_SCHEDULER_SIMPLE_SMP(6); +RTEMS_SCHEDULER_SIMPLE_SMP(7); +RTEMS_SCHEDULER_SIMPLE_SMP(8); +RTEMS_SCHEDULER_SIMPLE_SMP(9); +RTEMS_SCHEDULER_SIMPLE_SMP(10); +RTEMS_SCHEDULER_SIMPLE_SMP(11); +RTEMS_SCHEDULER_SIMPLE_SMP(12); +RTEMS_SCHEDULER_SIMPLE_SMP(13); +RTEMS_SCHEDULER_SIMPLE_SMP(14); +RTEMS_SCHEDULER_SIMPLE_SMP(15); +RTEMS_SCHEDULER_SIMPLE_SMP(16); + +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16) + +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN(2, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c index 3cf068d809..91c0014a63 100644 --- a/testsuites/smptests/smpmutex01/init.c +++ b/testsuites/smptests/smpmutex01/init.c @@ -1040,15 +1040,15 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a); +RTEMS_SCHEDULER_SIMPLE_SMP(a); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(b); +RTEMS_SCHEDULER_SIMPLE_SMP(b); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, SCHED_A), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(b, SCHED_B) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, SCHED_A), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(b, SCHED_B) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL) diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c index 7f8d331ef7..9591b46217 100644 --- a/testsuites/smptests/smpmutex02/init.c +++ b/testsuites/smptests/smpmutex02/init.c @@ -328,74 +328,74 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31); - -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31) - -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +RTEMS_SCHEDULER_SIMPLE_SMP(0); +RTEMS_SCHEDULER_SIMPLE_SMP(1); +RTEMS_SCHEDULER_SIMPLE_SMP(2); +RTEMS_SCHEDULER_SIMPLE_SMP(3); +RTEMS_SCHEDULER_SIMPLE_SMP(4); +RTEMS_SCHEDULER_SIMPLE_SMP(5); +RTEMS_SCHEDULER_SIMPLE_SMP(6); +RTEMS_SCHEDULER_SIMPLE_SMP(7); +RTEMS_SCHEDULER_SIMPLE_SMP(8); +RTEMS_SCHEDULER_SIMPLE_SMP(9); +RTEMS_SCHEDULER_SIMPLE_SMP(10); +RTEMS_SCHEDULER_SIMPLE_SMP(11); +RTEMS_SCHEDULER_SIMPLE_SMP(12); +RTEMS_SCHEDULER_SIMPLE_SMP(13); +RTEMS_SCHEDULER_SIMPLE_SMP(14); +RTEMS_SCHEDULER_SIMPLE_SMP(15); +RTEMS_SCHEDULER_SIMPLE_SMP(16); +RTEMS_SCHEDULER_SIMPLE_SMP(17); +RTEMS_SCHEDULER_SIMPLE_SMP(18); +RTEMS_SCHEDULER_SIMPLE_SMP(19); +RTEMS_SCHEDULER_SIMPLE_SMP(20); +RTEMS_SCHEDULER_SIMPLE_SMP(21); +RTEMS_SCHEDULER_SIMPLE_SMP(22); +RTEMS_SCHEDULER_SIMPLE_SMP(23); +RTEMS_SCHEDULER_SIMPLE_SMP(24); +RTEMS_SCHEDULER_SIMPLE_SMP(25); +RTEMS_SCHEDULER_SIMPLE_SMP(26); +RTEMS_SCHEDULER_SIMPLE_SMP(27); +RTEMS_SCHEDULER_SIMPLE_SMP(28); +RTEMS_SCHEDULER_SIMPLE_SMP(29); +RTEMS_SCHEDULER_SIMPLE_SMP(30); +RTEMS_SCHEDULER_SIMPLE_SMP(31); + +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(17, 17), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(18, 18), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(19, 19), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(20, 20), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(21, 21), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(22, 22), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(23, 23), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(24, 24), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(25, 25), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(26, 26), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(27, 27), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(28, 28), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(29, 29), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(30, 30), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(31, 31) + +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN(2, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c index a85cc698d7..5ba24baadc 100644 --- a/testsuites/smptests/smppsxmutex01/init.c +++ b/testsuites/smptests/smppsxmutex01/init.c @@ -164,15 +164,15 @@ static void *POSIX_Init(void *arg) #include -RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, 128); +RTEMS_SCHEDULER_PRIORITY_SMP(a, 128); -RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(b, 256); +RTEMS_SCHEDULER_PRIORITY_SMP(b, 256); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, SCHED_A), \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(b, SCHED_B) \ +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, SCHED_A), \ + RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(b, SCHED_B) \ -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL) diff --git a/testsuites/smptests/smpschededf01/init.c b/testsuites/smptests/smpschededf01/init.c index 9f53a960a4..c049c63a3b 100644 --- a/testsuites/smptests/smpschededf01/init.c +++ b/testsuites/smptests/smpschededf01/init.c @@ -137,12 +137,12 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS); +RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_EDF_SMP(a, rtems_build_name('E', 'D', 'F', ' ')) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_EDF_SMP(a, rtems_build_name('E', 'D', 'F', ' ')) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c index c64e3d3b4c..69d6d24f1a 100644 --- a/testsuites/smptests/smpscheduler02/init.c +++ b/testsuites/smptests/smpscheduler02/init.c @@ -438,18 +438,18 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, 256); +RTEMS_SCHEDULER_PRIORITY_SMP(a, 256); -RTEMS_SCHEDULER_CONTEXT_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS); +RTEMS_SCHEDULER_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(c); +RTEMS_SCHEDULER_SIMPLE_SMP(c); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, SCHED_A), \ - RTEMS_SCHEDULER_CONTROL_EDF_SMP(b, SCHED_B), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(c, SCHED_C) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, SCHED_A), \ + RTEMS_SCHEDULER_TABLE_EDF_SMP(b, SCHED_B), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(c, SCHED_C) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER, RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER, \ diff --git a/testsuites/smptests/smpscheduler03/init.c b/testsuites/smptests/smpscheduler03/init.c index 56fbd337fc..024e3cdd48 100644 --- a/testsuites/smptests/smpscheduler03/init.c +++ b/testsuites/smptests/smpscheduler03/init.c @@ -34,12 +34,12 @@ const char rtems_test_name[] = "SMPSCHEDULER 3"; #include -RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1); +RTEMS_SCHEDULER_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, rtems_build_name('T', 'E', 'S', 'T')) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, rtems_build_name('T', 'E', 'S', 'T')) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) #define CONFIGURE_MAXIMUM_TASKS 3 diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c index f31925f1a2..b4bb4ebcda 100644 --- a/testsuites/smptests/smpscheduler04/init.c +++ b/testsuites/smptests/smpscheduler04/init.c @@ -186,74 +186,74 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30); -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31); - -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31) - -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +RTEMS_SCHEDULER_SIMPLE_SMP(0); +RTEMS_SCHEDULER_SIMPLE_SMP(1); +RTEMS_SCHEDULER_SIMPLE_SMP(2); +RTEMS_SCHEDULER_SIMPLE_SMP(3); +RTEMS_SCHEDULER_SIMPLE_SMP(4); +RTEMS_SCHEDULER_SIMPLE_SMP(5); +RTEMS_SCHEDULER_SIMPLE_SMP(6); +RTEMS_SCHEDULER_SIMPLE_SMP(7); +RTEMS_SCHEDULER_SIMPLE_SMP(8); +RTEMS_SCHEDULER_SIMPLE_SMP(9); +RTEMS_SCHEDULER_SIMPLE_SMP(10); +RTEMS_SCHEDULER_SIMPLE_SMP(11); +RTEMS_SCHEDULER_SIMPLE_SMP(12); +RTEMS_SCHEDULER_SIMPLE_SMP(13); +RTEMS_SCHEDULER_SIMPLE_SMP(14); +RTEMS_SCHEDULER_SIMPLE_SMP(15); +RTEMS_SCHEDULER_SIMPLE_SMP(16); +RTEMS_SCHEDULER_SIMPLE_SMP(17); +RTEMS_SCHEDULER_SIMPLE_SMP(18); +RTEMS_SCHEDULER_SIMPLE_SMP(19); +RTEMS_SCHEDULER_SIMPLE_SMP(20); +RTEMS_SCHEDULER_SIMPLE_SMP(21); +RTEMS_SCHEDULER_SIMPLE_SMP(22); +RTEMS_SCHEDULER_SIMPLE_SMP(23); +RTEMS_SCHEDULER_SIMPLE_SMP(24); +RTEMS_SCHEDULER_SIMPLE_SMP(25); +RTEMS_SCHEDULER_SIMPLE_SMP(26); +RTEMS_SCHEDULER_SIMPLE_SMP(27); +RTEMS_SCHEDULER_SIMPLE_SMP(28); +RTEMS_SCHEDULER_SIMPLE_SMP(29); +RTEMS_SCHEDULER_SIMPLE_SMP(30); +RTEMS_SCHEDULER_SIMPLE_SMP(31); + +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(17, 17), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(18, 18), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(19, 19), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(20, 20), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(21, 21), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(22, 22), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(23, 23), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(24, 24), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(25, 25), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(26, 26), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(27, 27), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(28, 28), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(29, 29), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(30, 30), \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(31, 31) + +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN(2, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ diff --git a/testsuites/smptests/smpscheduler05/init.c b/testsuites/smptests/smpscheduler05/init.c index b86ceea2cc..4a1d0b6db3 100644 --- a/testsuites/smptests/smpscheduler05/init.c +++ b/testsuites/smptests/smpscheduler05/init.c @@ -32,12 +32,12 @@ const char rtems_test_name[] = "SMPSCHEDULER 5"; #include -RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a); +RTEMS_SCHEDULER_SIMPLE_SMP(a); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, rtems_build_name('T', 'E', 'S', 'T')) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, rtems_build_name('T', 'E', 'S', 'T')) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) #define CONFIGURE_MAXIMUM_TASKS 3 diff --git a/testsuites/smptests/smpscheduler06/init.c b/testsuites/smptests/smpscheduler06/init.c index 44b45b7478..1559e04d43 100644 --- a/testsuites/smptests/smpscheduler06/init.c +++ b/testsuites/smptests/smpscheduler06/init.c @@ -34,18 +34,18 @@ const char rtems_test_name[] = "SMPSCHEDULER 6"; #include -RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP( +RTEMS_SCHEDULER_PRIORITY_AFFINITY_SMP( a, CONFIGURE_MAXIMUM_PRIORITY + 1 ); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( \ +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_PRIORITY_AFFINITY_SMP( \ a, \ rtems_build_name('T', 'E', 'S', 'T') \ ) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) #define CONFIGURE_MAXIMUM_TASKS 3 diff --git a/testsuites/smptests/smpscheduler07/init.c b/testsuites/smptests/smpscheduler07/init.c index 70532aac94..9fb77c6a42 100644 --- a/testsuites/smptests/smpscheduler07/init.c +++ b/testsuites/smptests/smpscheduler07/init.c @@ -32,12 +32,12 @@ const char rtems_test_name[] = "SMPSCHEDULER 7"; #include -RTEMS_SCHEDULER_CONTEXT_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS); +RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_EDF_SMP( a, rtems_build_name('T', 'E', 'S', 'T')) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_EDF_SMP( a, rtems_build_name('T', 'E', 'S', 'T')) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY) #define CONFIGURE_MAXIMUM_TASKS 3 diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c index b259e3b5fc..07e260e1a6 100644 --- a/testsuites/smptests/smpwakeafter01/init.c +++ b/testsuites/smptests/smpwakeafter01/init.c @@ -162,15 +162,15 @@ static void Init(rtems_task_argument arg) #include -RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1); +RTEMS_SCHEDULER_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1); -RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(b, CONFIGURE_MAXIMUM_PRIORITY + 1); +RTEMS_SCHEDULER_PRIORITY_SMP(b, CONFIGURE_MAXIMUM_PRIORITY + 1); -#define CONFIGURE_SCHEDULER_CONTROLS \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, SCHED_A), \ - RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(b, SCHED_B) +#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ + RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, SCHED_A), \ + RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(b, SCHED_B) -#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ +#define CONFIGURE_SCHEDULER_ASSIGNMENTS \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ -- cgit v1.2.3