config: Use new scheduler configuration defines

Update #3325.

1 files changed, 68 insertions, 68 deletions

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.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), \