[rtems commit] config: Use new scheduler configuration defines
Sebastian Huber
sebh at rtems.org
Mon Mar 12 06:02:50 UTC 2018
Module: rtems
Branch: master
Commit: 6fadb7af092edc2caab1c34d004341ea784989f7
Changeset: http://git.rtems.org/rtems/commit/?id=6fadb7af092edc2caab1c34d004341ea784989f7
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu Mar 8 06:33:24 2018 +0100
config: Use new scheduler configuration defines
Update #3325.
---
cpukit/include/rtems/confdefs.h | 36 ++++----
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 +--
testsuites/sptests/spinternalerror01/init.c | 4 +-
testsuites/sptests/sptimecounter01/init.c | 4 +-
20 files changed, 326 insertions(+), 326 deletions(-)
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index bbcfb61..9c83691 100755
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -768,14 +768,14 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
- RTEMS_SCHEDULER_CONTEXT_PRIORITY( \
+ RTEMS_SCHEDULER_PRIORITY( \
dflt, \
CONFIGURE_MAXIMUM_PRIORITY + 1 \
)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_PRIORITY(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_PRIORITY(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -792,14 +792,14 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
- RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP( \
+ RTEMS_SCHEDULER_PRIORITY_SMP( \
dflt, \
CONFIGURE_MAXIMUM_PRIORITY + 1 \
)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -816,14 +816,14 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
- RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP( \
+ RTEMS_SCHEDULER_PRIORITY_AFFINITY_SMP( \
dflt, \
CONFIGURE_MAXIMUM_PRIORITY + 1 \
)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( \
+ RTEMS_SCHEDULER_TABLE_PRIORITY_AFFINITY_SMP( \
dflt, \
CONFIGURE_SCHEDULER_NAME \
)
@@ -843,14 +843,14 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
- RTEMS_SCHEDULER_CONTEXT_STRONG_APA( \
+ RTEMS_SCHEDULER_STRONG_APA( \
dflt, \
CONFIGURE_MAXIMUM_PRIORITY + 1 \
)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_STRONG_APA(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_STRONG_APA(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -865,11 +865,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
- #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_SIMPLE(dflt)
+ #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_SIMPLE(dflt)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_SIMPLE(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_SIMPLE(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -885,11 +885,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
- RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(dflt)
+ RTEMS_SCHEDULER_SIMPLE_SMP(dflt)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -904,11 +904,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
- #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_EDF(dflt)
+ #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_EDF(dflt)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_EDF(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_EDF(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -924,11 +924,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
- RTEMS_SCHEDULER_CONTEXT_EDF_SMP(dflt, CONFIGURE_MAXIMUM_PROCESSORS)
+ RTEMS_SCHEDULER_EDF_SMP(dflt, CONFIGURE_MAXIMUM_PROCESSORS)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_EDF_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_EDF_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#endif
@@ -943,11 +943,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
- #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_CBS(dflt)
+ #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CBS(dflt)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
- RTEMS_SCHEDULER_CONTROL_CBS(dflt, CONFIGURE_SCHEDULER_NAME)
+ RTEMS_SCHEDULER_TABLE_CBS(dflt, CONFIGURE_SCHEDULER_NAME)
#endif
#ifndef CONFIGURE_CBS_MAXIMUM_SERVERS
diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c
index 8e0d930..ecfab36 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.h>
-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 5599e79..d2da964 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 b850f92..c64c515 100644
--- a/testsuites/smptests/smpfatal05/init.c
+++ b/testsuites/smptests/smpfatal05/init.c
@@ -62,15 +62,15 @@ static void fatal_extension(
#include <rtems/scheduler.h>
-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 b440013..83a82da 100644
--- a/testsuites/smptests/smpfatal08/init.c
+++ b/testsuites/smptests/smpfatal08/init.c
@@ -118,12 +118,12 @@ static void fatal_extension(
#include <rtems/scheduler.h>
-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 2a022d7..74088dd 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.h>
-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 b818771..4d4e635 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.h>
-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 3cf068d..91c0014 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.h>
-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 7f8d331..9591b46 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.h>
-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 a85cc69..5ba24ba 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.h>
-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 9f53a96..c049c63 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.h>
-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 c64e3d3..69d6d24 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.h>
-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 56fbd33..024e3cd 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.h>
-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 f31925f..b4bb4eb 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.h>
-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 b86ceea..4a1d0b6 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.h>
-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 44b45b7..1559e04 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.h>
-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 70532aa..9fb77c6 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.h>
-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 b259e3b..07e260e 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.h>
-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), \
diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
index 4ee70b9..3012d73 100644
--- a/testsuites/sptests/spinternalerror01/init.c
+++ b/testsuites/sptests/spinternalerror01/init.c
@@ -70,9 +70,9 @@ static void *idle_body(uintptr_t ignored)
#define CONFIGURE_SCHEDULER_USER
-#define CONFIGURE_SCHEDULER_CONTEXT
+#define CONFIGURE_SCHEDULER
-#define CONFIGURE_SCHEDULER_CONTROLS { }
+#define CONFIGURE_SCHEDULER_TABLE_ENTRIES { }
#define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER 0
diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c
index f56e8cf..6976f7b 100644
--- a/testsuites/sptests/sptimecounter01/init.c
+++ b/testsuites/sptests/sptimecounter01/init.c
@@ -161,9 +161,9 @@ void boot_card(const char *cmdline)
#define CONFIGURE_SCHEDULER_USER
-#define CONFIGURE_SCHEDULER_CONTEXT
+#define CONFIGURE_SCHEDULER
-#define CONFIGURE_SCHEDULER_CONTROLS { }
+#define CONFIGURE_SCHEDULER_TABLE_ENTRIES { }
#define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER 0
More information about the vc
mailing list