Changeset 6fadb7af in rtems


Ignore:
Timestamp:
03/08/18 05:33:24 (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
5, master
Children:
0fb724a
Parents:
2ef85b1
git-author:
Sebastian Huber <sebastian.huber@…> (03/08/18 05:33:24)
git-committer:
Sebastian Huber <sebastian.huber@…> (03/12/18 06:01:30)
Message:

config: Use new scheduler configuration defines

Update #3325.

Files:
20 edited

Legend:

Unmodified
Added
Removed

  • cpukit/include/rtems/confdefs.h

    r2ef85b1 r6fadb7af  
    769769    /** Configure the context needed by the scheduler instance */
    770770    #define CONFIGURE_SCHEDULER \
    771       RTEMS_SCHEDULER_CONTEXT_PRIORITY( \
     771      RTEMS_SCHEDULER_PRIORITY( \
    772772        dflt, \
    773773        CONFIGURE_MAXIMUM_PRIORITY + 1 \
    … …  
    776776    /** Configure the controls for this scheduler instance */
    777777    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    778       RTEMS_SCHEDULER_CONTROL_PRIORITY(dflt, CONFIGURE_SCHEDULER_NAME)
     778      RTEMS_SCHEDULER_TABLE_PRIORITY(dflt, CONFIGURE_SCHEDULER_NAME)
    779779  #endif
    780780#endif
    … …  
    793793    /** Configure the context needed by the scheduler instance */
    794794    #define CONFIGURE_SCHEDULER \
    795       RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP( \
     795      RTEMS_SCHEDULER_PRIORITY_SMP( \
    796796        dflt, \
    797797        CONFIGURE_MAXIMUM_PRIORITY + 1 \
    … …  
    800800    /** Configure the controls for this scheduler instance */
    801801    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    802       RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
     802      RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
    803803  #endif
    804804#endif
    … …  
    817817    /** Configure the context needed by the scheduler instance */
    818818    #define CONFIGURE_SCHEDULER \
    819       RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP( \
     819      RTEMS_SCHEDULER_PRIORITY_AFFINITY_SMP( \
    820820        dflt, \
    821821        CONFIGURE_MAXIMUM_PRIORITY + 1 \
    … …  
    824824    /** Configure the controls for this scheduler instance */
    825825    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    826       RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( \
     826      RTEMS_SCHEDULER_TABLE_PRIORITY_AFFINITY_SMP( \
    827827        dflt, \
    828828        CONFIGURE_SCHEDULER_NAME \
    … …  
    844844    /** Configure the context needed by the scheduler instance */
    845845    #define CONFIGURE_SCHEDULER \
    846       RTEMS_SCHEDULER_CONTEXT_STRONG_APA( \
     846      RTEMS_SCHEDULER_STRONG_APA( \
    847847        dflt, \
    848848        CONFIGURE_MAXIMUM_PRIORITY + 1 \
    … …  
    851851    /** Configure the controls for this scheduler instance */
    852852    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    853       RTEMS_SCHEDULER_CONTROL_STRONG_APA(dflt, CONFIGURE_SCHEDULER_NAME)
     853      RTEMS_SCHEDULER_TABLE_STRONG_APA(dflt, CONFIGURE_SCHEDULER_NAME)
    854854  #endif
    855855#endif
    … …  
    866866  #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
    867867    /** Configure the context needed by the scheduler instance */
    868     #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_SIMPLE(dflt)
     868    #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_SIMPLE(dflt)
    869869
    870870    /** Configure the controls for this scheduler instance */
    871871    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    872       RTEMS_SCHEDULER_CONTROL_SIMPLE(dflt, CONFIGURE_SCHEDULER_NAME)
     872      RTEMS_SCHEDULER_TABLE_SIMPLE(dflt, CONFIGURE_SCHEDULER_NAME)
    873873  #endif
    874874#endif
    … …  
    886886    /** Configure the context needed by the scheduler instance */
    887887    #define CONFIGURE_SCHEDULER \
    888       RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(dflt)
     888      RTEMS_SCHEDULER_SIMPLE_SMP(dflt)
    889889
    890890    /** Configure the controls for this scheduler instance */
    891891    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    892       RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
     892      RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
    893893  #endif
    894894#endif
    … …  
    905905  #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
    906906    /** Configure the context needed by the scheduler instance */
    907     #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_EDF(dflt)
     907    #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_EDF(dflt)
    908908
    909909    /** Configure the controls for this scheduler instance */
    910910    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    911       RTEMS_SCHEDULER_CONTROL_EDF(dflt, CONFIGURE_SCHEDULER_NAME)
     911      RTEMS_SCHEDULER_TABLE_EDF(dflt, CONFIGURE_SCHEDULER_NAME)
    912912  #endif
    913913#endif
    … …  
    925925    /** Configure the context needed by the scheduler instance */
    926926    #define CONFIGURE_SCHEDULER \
    927       RTEMS_SCHEDULER_CONTEXT_EDF_SMP(dflt, CONFIGURE_MAXIMUM_PROCESSORS)
     927      RTEMS_SCHEDULER_EDF_SMP(dflt, CONFIGURE_MAXIMUM_PROCESSORS)
    928928
    929929    /** Configure the controls for this scheduler instance */
    930930    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    931       RTEMS_SCHEDULER_CONTROL_EDF_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
     931      RTEMS_SCHEDULER_TABLE_EDF_SMP(dflt, CONFIGURE_SCHEDULER_NAME)
    932932  #endif
    933933#endif
    … …  
    944944  #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
    945945    /** Configure the context needed by the scheduler instance */
    946     #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_CBS(dflt)
     946    #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CBS(dflt)
    947947
    948948    /** Configure the controls for this scheduler instance */
    949949    #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
    950       RTEMS_SCHEDULER_CONTROL_CBS(dflt, CONFIGURE_SCHEDULER_NAME)
     950      RTEMS_SCHEDULER_TABLE_CBS(dflt, CONFIGURE_SCHEDULER_NAME)
    951951  #endif
    952952

  • testsuites/smptests/smpclock01/init.c

    r2ef85b1 r6fadb7af  
    181181#include <rtems/scheduler.h>
    182182
    183 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a);
    184 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(b);
    185 
    186 #define CONFIGURE_SCHEDULER_CONTROLS \
    187   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, SCHEDULER_A), \
    188   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(b, SCHEDULER_B)
    189 
    190 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     183RTEMS_SCHEDULER_SIMPLE_SMP(a);
     184RTEMS_SCHEDULER_SIMPLE_SMP(b);
     185
     186#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     187  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, SCHEDULER_A), \
     188  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(b, SCHEDULER_B)
     189
     190#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    191191  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    192192  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL)

  • testsuites/smptests/smpfatal04/init.c

    r2ef85b1 r6fadb7af  
    6262  RTEMS_TEST_INITIAL_EXTENSION
    6363
    64 #define CONFIGURE_SCHEDULER_CONTROLS
     64#define CONFIGURE_SCHEDULER_TABLE_ENTRIES
    6565
    66 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER
     66#define CONFIGURE_SCHEDULER_ASSIGNMENTS RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER
    6767
    6868#define CONFIGURE_MAXIMUM_TASKS 1

  • testsuites/smptests/smpfatal05/init.c

    r2ef85b1 r6fadb7af  
    6363#include <rtems/scheduler.h>
    6464
    65 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a);
     65RTEMS_SCHEDULER_SIMPLE_SMP(a);
    6666
    67 #define CONFIGURE_SCHEDULER_CONTROLS \
    68   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P'))
     67#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     68  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P'))
    6969
    7070#define ASSIGN \
    7171  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
    7272
    73 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     73#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    7474 ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, \
    7575 ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, ASSIGN, \

  • testsuites/smptests/smpfatal08/init.c

    r2ef85b1 r6fadb7af  
    119119#include <rtems/scheduler.h>
    120120
    121 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a);
     121RTEMS_SCHEDULER_SIMPLE_SMP(a);
    122122
    123 #define CONFIGURE_SCHEDULER_CONTROLS \
    124   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P'))
     123#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     124  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, rtems_build_name('S', 'I', 'M', 'P'))
    125125
    126 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     126#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    127127  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    128128  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)

  • testsuites/smptests/smpmigration02/init.c

    r2ef85b1 r6fadb7af  
    288288#include <rtems/scheduler.h>
    289289
    290 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0);
    291 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1);
    292 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2);
    293 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3);
    294 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4);
    295 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5);
    296 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6);
    297 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7);
    298 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8);
    299 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9);
    300 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10);
    301 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11);
    302 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12);
    303 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13);
    304 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14);
    305 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15);
    306 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16);
    307 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17);
    308 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18);
    309 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19);
    310 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20);
    311 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21);
    312 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22);
    313 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23);
    314 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24);
    315 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25);
    316 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26);
    317 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27);
    318 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28);
    319 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29);
    320 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30);
    321 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31);
    322 
    323 #define CONFIGURE_SCHEDULER_CONTROLS \
    324   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \
    325   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \
    326   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \
    327   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \
    328   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \
    329   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \
    330   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \
    331   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \
    332   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \
    333   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \
    334   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \
    335   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \
    336   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \
    337   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \
    338   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \
    339   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \
    340   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \
    341   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \
    342   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \
    343   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \
    344   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \
    345   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \
    346   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \
    347   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \
    348   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \
    349   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \
    350   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \
    351   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \
    352   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \
    353   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \
    354   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \
    355   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31)
    356 
    357 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     290RTEMS_SCHEDULER_SIMPLE_SMP(0);
     291RTEMS_SCHEDULER_SIMPLE_SMP(1);
     292RTEMS_SCHEDULER_SIMPLE_SMP(2);
     293RTEMS_SCHEDULER_SIMPLE_SMP(3);
     294RTEMS_SCHEDULER_SIMPLE_SMP(4);
     295RTEMS_SCHEDULER_SIMPLE_SMP(5);
     296RTEMS_SCHEDULER_SIMPLE_SMP(6);
     297RTEMS_SCHEDULER_SIMPLE_SMP(7);
     298RTEMS_SCHEDULER_SIMPLE_SMP(8);
     299RTEMS_SCHEDULER_SIMPLE_SMP(9);
     300RTEMS_SCHEDULER_SIMPLE_SMP(10);
     301RTEMS_SCHEDULER_SIMPLE_SMP(11);
     302RTEMS_SCHEDULER_SIMPLE_SMP(12);
     303RTEMS_SCHEDULER_SIMPLE_SMP(13);
     304RTEMS_SCHEDULER_SIMPLE_SMP(14);
     305RTEMS_SCHEDULER_SIMPLE_SMP(15);
     306RTEMS_SCHEDULER_SIMPLE_SMP(16);
     307RTEMS_SCHEDULER_SIMPLE_SMP(17);
     308RTEMS_SCHEDULER_SIMPLE_SMP(18);
     309RTEMS_SCHEDULER_SIMPLE_SMP(19);
     310RTEMS_SCHEDULER_SIMPLE_SMP(20);
     311RTEMS_SCHEDULER_SIMPLE_SMP(21);
     312RTEMS_SCHEDULER_SIMPLE_SMP(22);
     313RTEMS_SCHEDULER_SIMPLE_SMP(23);
     314RTEMS_SCHEDULER_SIMPLE_SMP(24);
     315RTEMS_SCHEDULER_SIMPLE_SMP(25);
     316RTEMS_SCHEDULER_SIMPLE_SMP(26);
     317RTEMS_SCHEDULER_SIMPLE_SMP(27);
     318RTEMS_SCHEDULER_SIMPLE_SMP(28);
     319RTEMS_SCHEDULER_SIMPLE_SMP(29);
     320RTEMS_SCHEDULER_SIMPLE_SMP(30);
     321RTEMS_SCHEDULER_SIMPLE_SMP(31);
     322
     323#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     324  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \
     325  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \
     326  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \
     327  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \
     328  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \
     329  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \
     330  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \
     331  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \
     332  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \
     333  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \
     334  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \
     335  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \
     336  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \
     337  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \
     338  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \
     339  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \
     340  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16), \
     341  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(17, 17), \
     342  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(18, 18), \
     343  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(19, 19), \
     344  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(20, 20), \
     345  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(21, 21), \
     346  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(22, 22), \
     347  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(23, 23), \
     348  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(24, 24), \
     349  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(25, 25), \
     350  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(26, 26), \
     351  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(27, 27), \
     352  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(28, 28), \
     353  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(29, 29), \
     354  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(30, 30), \
     355  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(31, 31)
     356
     357#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    358358  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \
    359359  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \

  • testsuites/smptests/smpmrsp01/init.c

    r2ef85b1 r6fadb7af  
    17871787#include <rtems/scheduler.h>
    17881788
    1789 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0);
    1790 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1);
    1791 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2);
    1792 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3);
    1793 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4);
    1794 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5);
    1795 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6);
    1796 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7);
    1797 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8);
    1798 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9);
    1799 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10);
    1800 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11);
    1801 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12);
    1802 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13);
    1803 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14);
    1804 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15);
    1805 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16);
    1806 
    1807 #define CONFIGURE_SCHEDULER_CONTROLS \
    1808   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \
    1809   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \
    1810   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \
    1811   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \
    1812   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \
    1813   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \
    1814   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \
    1815   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \
    1816   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \
    1817   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \
    1818   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \
    1819   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \
    1820   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \
    1821   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \
    1822   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \
    1823   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \
    1824   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16)
    1825 
    1826 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     1789RTEMS_SCHEDULER_SIMPLE_SMP(0);
     1790RTEMS_SCHEDULER_SIMPLE_SMP(1);
     1791RTEMS_SCHEDULER_SIMPLE_SMP(2);
     1792RTEMS_SCHEDULER_SIMPLE_SMP(3);
     1793RTEMS_SCHEDULER_SIMPLE_SMP(4);
     1794RTEMS_SCHEDULER_SIMPLE_SMP(5);
     1795RTEMS_SCHEDULER_SIMPLE_SMP(6);
     1796RTEMS_SCHEDULER_SIMPLE_SMP(7);
     1797RTEMS_SCHEDULER_SIMPLE_SMP(8);
     1798RTEMS_SCHEDULER_SIMPLE_SMP(9);
     1799RTEMS_SCHEDULER_SIMPLE_SMP(10);
     1800RTEMS_SCHEDULER_SIMPLE_SMP(11);
     1801RTEMS_SCHEDULER_SIMPLE_SMP(12);
     1802RTEMS_SCHEDULER_SIMPLE_SMP(13);
     1803RTEMS_SCHEDULER_SIMPLE_SMP(14);
     1804RTEMS_SCHEDULER_SIMPLE_SMP(15);
     1805RTEMS_SCHEDULER_SIMPLE_SMP(16);
     1806
     1807#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     1808  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \
     1809  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \
     1810  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \
     1811  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \
     1812  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \
     1813  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \
     1814  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \
     1815  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \
     1816  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \
     1817  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \
     1818  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \
     1819  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \
     1820  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \
     1821  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \
     1822  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \
     1823  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \
     1824  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16)
     1825
     1826#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    18271827  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    18281828  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \

  • testsuites/smptests/smpmutex01/init.c

    r2ef85b1 r6fadb7af  
    10411041#include <rtems/scheduler.h>
    10421042
    1043 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a);
    1044 
    1045 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(b);
    1046 
    1047 #define CONFIGURE_SCHEDULER_CONTROLS \
    1048   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, SCHED_A), \
    1049   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(b, SCHED_B)
    1050 
    1051 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     1043RTEMS_SCHEDULER_SIMPLE_SMP(a);
     1044
     1045RTEMS_SCHEDULER_SIMPLE_SMP(b);
     1046
     1047#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     1048  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, SCHED_A), \
     1049  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(b, SCHED_B)
     1050
     1051#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    10521052  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    10531053  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL)

  • testsuites/smptests/smpmutex02/init.c

    r2ef85b1 r6fadb7af  
    329329#include <rtems/scheduler.h>
    330330
    331 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0);
    332 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1);
    333 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2);
    334 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3);
    335 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4);
    336 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5);
    337 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6);
    338 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7);
    339 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8);
    340 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9);
    341 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10);
    342 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11);
    343 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12);
    344 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13);
    345 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14);
    346 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15);
    347 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16);
    348 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17);
    349 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18);
    350 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19);
    351 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20);
    352 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21);
    353 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22);
    354 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23);
    355 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24);
    356 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25);
    357 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26);
    358 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27);
    359 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28);
    360 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29);
    361 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30);
    362 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31);
    363 
    364 #define CONFIGURE_SCHEDULER_CONTROLS \
    365   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \
    366   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \
    367   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \
    368   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \
    369   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \
    370   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \
    371   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \
    372   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \
    373   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \
    374   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \
    375   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \
    376   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \
    377   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \
    378   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \
    379   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \
    380   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \
    381   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \
    382   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \
    383   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \
    384   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \
    385   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \
    386   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \
    387   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \
    388   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \
    389   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \
    390   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \
    391   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \
    392   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \
    393   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \
    394   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \
    395   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \
    396   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31)
    397 
    398 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     331RTEMS_SCHEDULER_SIMPLE_SMP(0);
     332RTEMS_SCHEDULER_SIMPLE_SMP(1);
     333RTEMS_SCHEDULER_SIMPLE_SMP(2);
     334RTEMS_SCHEDULER_SIMPLE_SMP(3);
     335RTEMS_SCHEDULER_SIMPLE_SMP(4);
     336RTEMS_SCHEDULER_SIMPLE_SMP(5);
     337RTEMS_SCHEDULER_SIMPLE_SMP(6);
     338RTEMS_SCHEDULER_SIMPLE_SMP(7);
     339RTEMS_SCHEDULER_SIMPLE_SMP(8);
     340RTEMS_SCHEDULER_SIMPLE_SMP(9);
     341RTEMS_SCHEDULER_SIMPLE_SMP(10);
     342RTEMS_SCHEDULER_SIMPLE_SMP(11);
     343RTEMS_SCHEDULER_SIMPLE_SMP(12);
     344RTEMS_SCHEDULER_SIMPLE_SMP(13);
     345RTEMS_SCHEDULER_SIMPLE_SMP(14);
     346RTEMS_SCHEDULER_SIMPLE_SMP(15);
     347RTEMS_SCHEDULER_SIMPLE_SMP(16);
     348RTEMS_SCHEDULER_SIMPLE_SMP(17);
     349RTEMS_SCHEDULER_SIMPLE_SMP(18);
     350RTEMS_SCHEDULER_SIMPLE_SMP(19);
     351RTEMS_SCHEDULER_SIMPLE_SMP(20);
     352RTEMS_SCHEDULER_SIMPLE_SMP(21);
     353RTEMS_SCHEDULER_SIMPLE_SMP(22);
     354RTEMS_SCHEDULER_SIMPLE_SMP(23);
     355RTEMS_SCHEDULER_SIMPLE_SMP(24);
     356RTEMS_SCHEDULER_SIMPLE_SMP(25);
     357RTEMS_SCHEDULER_SIMPLE_SMP(26);
     358RTEMS_SCHEDULER_SIMPLE_SMP(27);
     359RTEMS_SCHEDULER_SIMPLE_SMP(28);
     360RTEMS_SCHEDULER_SIMPLE_SMP(29);
     361RTEMS_SCHEDULER_SIMPLE_SMP(30);
     362RTEMS_SCHEDULER_SIMPLE_SMP(31);
     363
     364#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     365  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \
     366  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \
     367  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \
     368  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \
     369  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \
     370  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \
     371  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \
     372  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \
     373  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \
     374  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \
     375  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \
     376  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \
     377  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \
     378  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \
     379  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \
     380  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \
     381  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16), \
     382  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(17, 17), \
     383  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(18, 18), \
     384  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(19, 19), \
     385  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(20, 20), \
     386  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(21, 21), \
     387  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(22, 22), \
     388  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(23, 23), \
     389  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(24, 24), \
     390  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(25, 25), \
     391  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(26, 26), \
     392  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(27, 27), \
     393  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(28, 28), \
     394  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(29, 29), \
     395  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(30, 30), \
     396  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(31, 31)
     397
     398#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    399399  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    400400  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \

  • testsuites/smptests/smppsxmutex01/init.c

    r2ef85b1 r6fadb7af  
    165165#include <rtems/scheduler.h>
    166166
    167 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, 128);
     167RTEMS_SCHEDULER_PRIORITY_SMP(a, 128);
    168168
    169 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(b, 256);
     169RTEMS_SCHEDULER_PRIORITY_SMP(b, 256);
    170170
    171 #define CONFIGURE_SCHEDULER_CONTROLS \
    172   RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, SCHED_A), \
    173   RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(b, SCHED_B)  \
     171#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     172  RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, SCHED_A), \
     173  RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(b, SCHED_B)  \
    174174
    175 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     175#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    176176  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    177177  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL)

  • testsuites/smptests/smpschededf01/init.c

    r2ef85b1 r6fadb7af  
    138138#include <rtems/scheduler.h>
    139139
    140 RTEMS_SCHEDULER_CONTEXT_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
     140RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
    141141
    142 #define CONFIGURE_SCHEDULER_CONTROLS \
    143   RTEMS_SCHEDULER_CONTROL_EDF_SMP(a, rtems_build_name('E', 'D', 'F', ' '))
     142#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     143  RTEMS_SCHEDULER_TABLE_EDF_SMP(a, rtems_build_name('E', 'D', 'F', ' '))
    144144
    145 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     145#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    146146  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
    147147

  • testsuites/smptests/smpscheduler02/init.c

    r2ef85b1 r6fadb7af  
    439439#include <rtems/scheduler.h>
    440440
    441 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, 256);
    442 
    443 RTEMS_SCHEDULER_CONTEXT_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS);
    444 
    445 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(c);
    446 
    447 #define CONFIGURE_SCHEDULER_CONTROLS \
    448   RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, SCHED_A), \
    449   RTEMS_SCHEDULER_CONTROL_EDF_SMP(b, SCHED_B), \
    450   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(c, SCHED_C)
    451 
    452 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     441RTEMS_SCHEDULER_PRIORITY_SMP(a, 256);
     442
     443RTEMS_SCHEDULER_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS);
     444
     445RTEMS_SCHEDULER_SIMPLE_SMP(c);
     446
     447#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     448  RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, SCHED_A), \
     449  RTEMS_SCHEDULER_TABLE_EDF_SMP(b, SCHED_B), \
     450  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(c, SCHED_C)
     451
     452#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    453453  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    454454  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \

  • testsuites/smptests/smpscheduler03/init.c

    r2ef85b1 r6fadb7af  
    3535#include <rtems/scheduler.h>
    3636
    37 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1);
     37RTEMS_SCHEDULER_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1);
    3838
    39 #define CONFIGURE_SCHEDULER_CONTROLS \
    40   RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, rtems_build_name('T', 'E', 'S', 'T'))
     39#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     40  RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, rtems_build_name('T', 'E', 'S', 'T'))
    4141
    42 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     42#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    4343  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
    4444

  • testsuites/smptests/smpscheduler04/init.c

    r2ef85b1 r6fadb7af  
    187187#include <rtems/scheduler.h>
    188188
    189 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0);
    190 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1);
    191 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2);
    192 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3);
    193 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4);
    194 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5);
    195 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6);
    196 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7);
    197 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8);
    198 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9);
    199 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10);
    200 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11);
    201 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12);
    202 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13);
    203 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14);
    204 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15);
    205 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16);
    206 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17);
    207 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18);
    208 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19);
    209 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20);
    210 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21);
    211 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22);
    212 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23);
    213 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24);
    214 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25);
    215 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26);
    216 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27);
    217 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28);
    218 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29);
    219 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30);
    220 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31);
    221 
    222 #define CONFIGURE_SCHEDULER_CONTROLS \
    223   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \
    224   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \
    225   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \
    226   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \
    227   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \
    228   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \
    229   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \
    230   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \
    231   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \
    232   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \
    233   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \
    234   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \
    235   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \
    236   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \
    237   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \
    238   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \
    239   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \
    240   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \
    241   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \
    242   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \
    243   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \
    244   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \
    245   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \
    246   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \
    247   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \
    248   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \
    249   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \
    250   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \
    251   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \
    252   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \
    253   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \
    254   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31)
    255 
    256 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     189RTEMS_SCHEDULER_SIMPLE_SMP(0);
     190RTEMS_SCHEDULER_SIMPLE_SMP(1);
     191RTEMS_SCHEDULER_SIMPLE_SMP(2);
     192RTEMS_SCHEDULER_SIMPLE_SMP(3);
     193RTEMS_SCHEDULER_SIMPLE_SMP(4);
     194RTEMS_SCHEDULER_SIMPLE_SMP(5);
     195RTEMS_SCHEDULER_SIMPLE_SMP(6);
     196RTEMS_SCHEDULER_SIMPLE_SMP(7);
     197RTEMS_SCHEDULER_SIMPLE_SMP(8);
     198RTEMS_SCHEDULER_SIMPLE_SMP(9);
     199RTEMS_SCHEDULER_SIMPLE_SMP(10);
     200RTEMS_SCHEDULER_SIMPLE_SMP(11);
     201RTEMS_SCHEDULER_SIMPLE_SMP(12);
     202RTEMS_SCHEDULER_SIMPLE_SMP(13);
     203RTEMS_SCHEDULER_SIMPLE_SMP(14);
     204RTEMS_SCHEDULER_SIMPLE_SMP(15);
     205RTEMS_SCHEDULER_SIMPLE_SMP(16);
     206RTEMS_SCHEDULER_SIMPLE_SMP(17);
     207RTEMS_SCHEDULER_SIMPLE_SMP(18);
     208RTEMS_SCHEDULER_SIMPLE_SMP(19);
     209RTEMS_SCHEDULER_SIMPLE_SMP(20);
     210RTEMS_SCHEDULER_SIMPLE_SMP(21);
     211RTEMS_SCHEDULER_SIMPLE_SMP(22);
     212RTEMS_SCHEDULER_SIMPLE_SMP(23);
     213RTEMS_SCHEDULER_SIMPLE_SMP(24);
     214RTEMS_SCHEDULER_SIMPLE_SMP(25);
     215RTEMS_SCHEDULER_SIMPLE_SMP(26);
     216RTEMS_SCHEDULER_SIMPLE_SMP(27);
     217RTEMS_SCHEDULER_SIMPLE_SMP(28);
     218RTEMS_SCHEDULER_SIMPLE_SMP(29);
     219RTEMS_SCHEDULER_SIMPLE_SMP(30);
     220RTEMS_SCHEDULER_SIMPLE_SMP(31);
     221
     222#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     223  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(0, 0), \
     224  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(1, 1), \
     225  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(2, 2), \
     226  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(3, 3), \
     227  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(4, 4), \
     228  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(5, 5), \
     229  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(6, 6), \
     230  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(7, 7), \
     231  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(8, 8), \
     232  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(9, 9), \
     233  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(10, 10), \
     234  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(11, 11), \
     235  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(12, 12), \
     236  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(13, 13), \
     237  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(14, 14), \
     238  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(15, 15), \
     239  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(16, 16), \
     240  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(17, 17), \
     241  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(18, 18), \
     242  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(19, 19), \
     243  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(20, 20), \
     244  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(21, 21), \
     245  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(22, 22), \
     246  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(23, 23), \
     247  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(24, 24), \
     248  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(25, 25), \
     249  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(26, 26), \
     250  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(27, 27), \
     251  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(28, 28), \
     252  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(29, 29), \
     253  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(30, 30), \
     254  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(31, 31)
     255
     256#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    257257  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    258258  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \

  • testsuites/smptests/smpscheduler05/init.c

    r2ef85b1 r6fadb7af  
    3333#include <rtems/scheduler.h>
    3434
    35 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a);
     35RTEMS_SCHEDULER_SIMPLE_SMP(a);
    3636
    37 #define CONFIGURE_SCHEDULER_CONTROLS \
    38   RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, rtems_build_name('T', 'E', 'S', 'T'))
     37#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     38  RTEMS_SCHEDULER_TABLE_SIMPLE_SMP(a, rtems_build_name('T', 'E', 'S', 'T'))
    3939
    40 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     40#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    4141  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
    4242

  • testsuites/smptests/smpscheduler06/init.c

    r2ef85b1 r6fadb7af  
    3535#include <rtems/scheduler.h>
    3636
    37 RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP(
     37RTEMS_SCHEDULER_PRIORITY_AFFINITY_SMP(
    3838  a,
    3939  CONFIGURE_MAXIMUM_PRIORITY + 1
    4040);
    4141
    42 #define CONFIGURE_SCHEDULER_CONTROLS \
    43   RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( \
     42#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     43  RTEMS_SCHEDULER_TABLE_PRIORITY_AFFINITY_SMP( \
    4444    a, \
    4545    rtems_build_name('T', 'E', 'S', 'T') \
    4646  )
    4747
    48 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     48#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    4949  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
    5050

  • testsuites/smptests/smpscheduler07/init.c

    r2ef85b1 r6fadb7af  
    3333#include <rtems/scheduler.h>
    3434
    35 RTEMS_SCHEDULER_CONTEXT_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
     35RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
    3636
    37 #define CONFIGURE_SCHEDULER_CONTROLS \
    38   RTEMS_SCHEDULER_CONTROL_EDF_SMP( a, rtems_build_name('T', 'E', 'S', 'T'))
     37#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     38  RTEMS_SCHEDULER_TABLE_EDF_SMP( a, rtems_build_name('T', 'E', 'S', 'T'))
    3939
    40 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     40#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    4141  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
    4242

  • testsuites/smptests/smpwakeafter01/init.c

    r2ef85b1 r6fadb7af  
    163163#include <rtems/scheduler.h>
    164164
    165 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1);
    166 
    167 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP(b, CONFIGURE_MAXIMUM_PRIORITY + 1);
    168 
    169 #define CONFIGURE_SCHEDULER_CONTROLS \
    170   RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(a, SCHED_A), \
    171   RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(b, SCHED_B)
    172 
    173 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
     165RTEMS_SCHEDULER_PRIORITY_SMP(a, CONFIGURE_MAXIMUM_PRIORITY + 1);
     166
     167RTEMS_SCHEDULER_PRIORITY_SMP(b, CONFIGURE_MAXIMUM_PRIORITY + 1);
     168
     169#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
     170  RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(a, SCHED_A), \
     171  RTEMS_SCHEDULER_TABLE_PRIORITY_SMP(b, SCHED_B)
     172
     173#define CONFIGURE_SCHEDULER_ASSIGNMENTS \
    174174  RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
    175175  RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \

  • testsuites/sptests/spinternalerror01/init.c

    r2ef85b1 r6fadb7af  
    7171#define CONFIGURE_SCHEDULER_USER
    7272
    73 #define CONFIGURE_SCHEDULER_CONTEXT
     73#define CONFIGURE_SCHEDULER
    7474
    75 #define CONFIGURE_SCHEDULER_CONTROLS { }
     75#define CONFIGURE_SCHEDULER_TABLE_ENTRIES { }
    7676
    7777#define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER 0

  • testsuites/sptests/sptimecounter01/init.c

    r2ef85b1 r6fadb7af  
    162162#define CONFIGURE_SCHEDULER_USER
    163163
    164 #define CONFIGURE_SCHEDULER_CONTEXT
     164#define CONFIGURE_SCHEDULER
    165165
    166 #define CONFIGURE_SCHEDULER_CONTROLS { }
     166#define CONFIGURE_SCHEDULER_TABLE_ENTRIES { }
    167167
    168168#define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER 0
Note: See TracChangeset for help on using the changeset viewer.