Changeset 2ef85b1 in rtems
- Timestamp:
- 03/08/18 05:20:10 (5 years ago)
- Branches:
- 5, master
- Children:
- 6fadb7af
- Parents:
- 4dfeba3
- git-author:
- Sebastian Huber <sebastian.huber@…> (03/08/18 05:20:10)
- git-committer:
- Sebastian Huber <sebastian.huber@…> (03/12/18 06:01:30)
- Location:
- cpukit/include/rtems
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/include/rtems/confdefs.h
r4dfeba3 r2ef85b1 710 710 * CONFIGURE_SCHEDULER_USER and the following: 711 711 * 712 * - CONFIGURE_SCHEDULER _CONTEXT713 * - CONFIGURE_SCHEDULER_ CONTROLS712 * - CONFIGURE_SCHEDULER 713 * - CONFIGURE_SCHEDULER_TABLE_ENTRIES 714 714 * - CONFIGURE_SCHEDULER_USER_PER_THREAD 715 715 */ 716 717 #ifdef CONFIGURE_SCHEDULER_CONTEXT 718 #warning "CONFIGURE_SCHEDULER_CONTEXT has been renamed to CONFIGURE_SCHEDULER since RTEMS 5.1" 719 #define CONFIGURE_SCHEDULER CONFIGURE_SCHEDULER_CONTEXT 720 #endif 721 722 #ifdef CONFIGURE_SCHEDULER_CONTROLS 723 #warning "CONFIGURE_SCHEDULER_CONTROLS has been renamed to CONFIGURE_SCHEDULER_TABLE_ENTRIES since RTEMS 5.1" 724 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES CONFIGURE_SCHEDULER_CONTROLS 725 #endif 726 727 #ifdef CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS 728 #warning "CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS has been renamed to CONFIGURE_SCHEDULER_ASSIGNMENTS since RTEMS 5.1" 729 #define CONFIGURE_SCHEDULER_ASSIGNMENTS CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS 730 #endif 716 731 717 732 #if !defined(CONFIGURE_SCHEDULER_USER) && \ … … 751 766 #endif 752 767 753 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)768 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 754 769 /** Configure the context needed by the scheduler instance */ 755 #define CONFIGURE_SCHEDULER _CONTEXT\770 #define CONFIGURE_SCHEDULER \ 756 771 RTEMS_SCHEDULER_CONTEXT_PRIORITY( \ 757 772 dflt, \ … … 760 775 761 776 /** Configure the controls for this scheduler instance */ 762 #define CONFIGURE_SCHEDULER_ CONTROLS \777 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 763 778 RTEMS_SCHEDULER_CONTROL_PRIORITY(dflt, CONFIGURE_SCHEDULER_NAME) 764 779 #endif … … 775 790 #endif 776 791 777 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)792 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 778 793 /** Configure the context needed by the scheduler instance */ 779 #define CONFIGURE_SCHEDULER _CONTEXT\794 #define CONFIGURE_SCHEDULER \ 780 795 RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP( \ 781 796 dflt, \ … … 784 799 785 800 /** Configure the controls for this scheduler instance */ 786 #define CONFIGURE_SCHEDULER_ CONTROLS \801 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 787 802 RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP(dflt, CONFIGURE_SCHEDULER_NAME) 788 803 #endif … … 799 814 #endif 800 815 801 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)816 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 802 817 /** Configure the context needed by the scheduler instance */ 803 #define CONFIGURE_SCHEDULER _CONTEXT\818 #define CONFIGURE_SCHEDULER \ 804 819 RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP( \ 805 820 dflt, \ … … 808 823 809 824 /** Configure the controls for this scheduler instance */ 810 #define CONFIGURE_SCHEDULER_ CONTROLS \825 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 811 826 RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( \ 812 827 dflt, \ … … 826 841 #endif 827 842 828 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)843 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 829 844 /** Configure the context needed by the scheduler instance */ 830 #define CONFIGURE_SCHEDULER _CONTEXT\845 #define CONFIGURE_SCHEDULER \ 831 846 RTEMS_SCHEDULER_CONTEXT_STRONG_APA( \ 832 847 dflt, \ … … 835 850 836 851 /** Configure the controls for this scheduler instance */ 837 #define CONFIGURE_SCHEDULER_ CONTROLS \852 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 838 853 RTEMS_SCHEDULER_CONTROL_STRONG_APA(dflt, CONFIGURE_SCHEDULER_NAME) 839 854 #endif … … 849 864 #endif 850 865 851 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)866 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 852 867 /** Configure the context needed by the scheduler instance */ 853 #define CONFIGURE_SCHEDULER _CONTEXTRTEMS_SCHEDULER_CONTEXT_SIMPLE(dflt)868 #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_SIMPLE(dflt) 854 869 855 870 /** Configure the controls for this scheduler instance */ 856 #define CONFIGURE_SCHEDULER_ CONTROLS \871 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 857 872 RTEMS_SCHEDULER_CONTROL_SIMPLE(dflt, CONFIGURE_SCHEDULER_NAME) 858 873 #endif … … 868 883 #endif 869 884 870 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)885 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 871 886 /** Configure the context needed by the scheduler instance */ 872 #define CONFIGURE_SCHEDULER _CONTEXT\887 #define CONFIGURE_SCHEDULER \ 873 888 RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(dflt) 874 889 875 890 /** Configure the controls for this scheduler instance */ 876 #define CONFIGURE_SCHEDULER_ CONTROLS \891 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 877 892 RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(dflt, CONFIGURE_SCHEDULER_NAME) 878 893 #endif … … 888 903 #endif 889 904 890 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)905 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 891 906 /** Configure the context needed by the scheduler instance */ 892 #define CONFIGURE_SCHEDULER _CONTEXTRTEMS_SCHEDULER_CONTEXT_EDF(dflt)907 #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_EDF(dflt) 893 908 894 909 /** Configure the controls for this scheduler instance */ 895 #define CONFIGURE_SCHEDULER_ CONTROLS \910 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 896 911 RTEMS_SCHEDULER_CONTROL_EDF(dflt, CONFIGURE_SCHEDULER_NAME) 897 912 #endif … … 907 922 #endif 908 923 909 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)924 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 910 925 /** Configure the context needed by the scheduler instance */ 911 #define CONFIGURE_SCHEDULER _CONTEXT\926 #define CONFIGURE_SCHEDULER \ 912 927 RTEMS_SCHEDULER_CONTEXT_EDF_SMP(dflt, CONFIGURE_MAXIMUM_PROCESSORS) 913 928 914 929 /** Configure the controls for this scheduler instance */ 915 #define CONFIGURE_SCHEDULER_ CONTROLS \930 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 916 931 RTEMS_SCHEDULER_CONTROL_EDF_SMP(dflt, CONFIGURE_SCHEDULER_NAME) 917 932 #endif … … 927 942 #endif 928 943 929 #if !defined(CONFIGURE_SCHEDULER_ CONTROLS)944 #if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES) 930 945 /** Configure the context needed by the scheduler instance */ 931 #define CONFIGURE_SCHEDULER _CONTEXTRTEMS_SCHEDULER_CONTEXT_CBS(dflt)946 #define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_CONTEXT_CBS(dflt) 932 947 933 948 /** Configure the controls for this scheduler instance */ 934 #define CONFIGURE_SCHEDULER_ CONTROLS \949 #define CONFIGURE_SCHEDULER_TABLE_ENTRIES \ 935 950 RTEMS_SCHEDULER_CONTROL_CBS(dflt, CONFIGURE_SCHEDULER_NAME) 936 951 #endif … … 954 969 */ 955 970 #ifdef CONFIGURE_INIT 956 #if defined(CONFIGURE_SCHEDULER _CONTEXT)957 CONFIGURE_SCHEDULER _CONTEXT;971 #if defined(CONFIGURE_SCHEDULER) 972 CONFIGURE_SCHEDULER; 958 973 #endif 959 974 960 975 const Scheduler_Control _Scheduler_Table[] = { 961 CONFIGURE_SCHEDULER_ CONTROLS976 CONFIGURE_SCHEDULER_TABLE_ENTRIES 962 977 }; 963 978 … … 968 983 969 984 const Scheduler_Assignment _Scheduler_Initial_assignments[] = { 970 #if defined(CONFIGURE_S MP_SCHEDULER_ASSIGNMENTS)971 CONFIGURE_S MP_SCHEDULER_ASSIGNMENTS985 #if defined(CONFIGURE_SCHEDULER_ASSIGNMENTS) 986 CONFIGURE_SCHEDULER_ASSIGNMENTS 972 987 #else 973 #define _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT\988 #define _CONFIGURE_SCHEDULER_ASSIGN \ 974 989 RTEMS_SCHEDULER_ASSIGN( \ 975 990 0, \ 976 991 RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL \ 977 992 ) 978 _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT993 _CONFIGURE_SCHEDULER_ASSIGN 979 994 #if CONFIGURE_MAXIMUM_PROCESSORS >= 2 980 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT995 , _CONFIGURE_SCHEDULER_ASSIGN 981 996 #endif 982 997 #if CONFIGURE_MAXIMUM_PROCESSORS >= 3 983 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT998 , _CONFIGURE_SCHEDULER_ASSIGN 984 999 #endif 985 1000 #if CONFIGURE_MAXIMUM_PROCESSORS >= 4 986 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1001 , _CONFIGURE_SCHEDULER_ASSIGN 987 1002 #endif 988 1003 #if CONFIGURE_MAXIMUM_PROCESSORS >= 5 989 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1004 , _CONFIGURE_SCHEDULER_ASSIGN 990 1005 #endif 991 1006 #if CONFIGURE_MAXIMUM_PROCESSORS >= 6 992 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1007 , _CONFIGURE_SCHEDULER_ASSIGN 993 1008 #endif 994 1009 #if CONFIGURE_MAXIMUM_PROCESSORS >= 7 995 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1010 , _CONFIGURE_SCHEDULER_ASSIGN 996 1011 #endif 997 1012 #if CONFIGURE_MAXIMUM_PROCESSORS >= 8 998 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1013 , _CONFIGURE_SCHEDULER_ASSIGN 999 1014 #endif 1000 1015 #if CONFIGURE_MAXIMUM_PROCESSORS >= 9 1001 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1016 , _CONFIGURE_SCHEDULER_ASSIGN 1002 1017 #endif 1003 1018 #if CONFIGURE_MAXIMUM_PROCESSORS >= 10 1004 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1019 , _CONFIGURE_SCHEDULER_ASSIGN 1005 1020 #endif 1006 1021 #if CONFIGURE_MAXIMUM_PROCESSORS >= 11 1007 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1022 , _CONFIGURE_SCHEDULER_ASSIGN 1008 1023 #endif 1009 1024 #if CONFIGURE_MAXIMUM_PROCESSORS >= 12 1010 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1025 , _CONFIGURE_SCHEDULER_ASSIGN 1011 1026 #endif 1012 1027 #if CONFIGURE_MAXIMUM_PROCESSORS >= 13 1013 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1028 , _CONFIGURE_SCHEDULER_ASSIGN 1014 1029 #endif 1015 1030 #if CONFIGURE_MAXIMUM_PROCESSORS >= 14 1016 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1031 , _CONFIGURE_SCHEDULER_ASSIGN 1017 1032 #endif 1018 1033 #if CONFIGURE_MAXIMUM_PROCESSORS >= 15 1019 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1034 , _CONFIGURE_SCHEDULER_ASSIGN 1020 1035 #endif 1021 1036 #if CONFIGURE_MAXIMUM_PROCESSORS >= 16 1022 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1037 , _CONFIGURE_SCHEDULER_ASSIGN 1023 1038 #endif 1024 1039 #if CONFIGURE_MAXIMUM_PROCESSORS >= 17 1025 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1040 , _CONFIGURE_SCHEDULER_ASSIGN 1026 1041 #endif 1027 1042 #if CONFIGURE_MAXIMUM_PROCESSORS >= 18 1028 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1043 , _CONFIGURE_SCHEDULER_ASSIGN 1029 1044 #endif 1030 1045 #if CONFIGURE_MAXIMUM_PROCESSORS >= 19 1031 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1046 , _CONFIGURE_SCHEDULER_ASSIGN 1032 1047 #endif 1033 1048 #if CONFIGURE_MAXIMUM_PROCESSORS >= 20 1034 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1049 , _CONFIGURE_SCHEDULER_ASSIGN 1035 1050 #endif 1036 1051 #if CONFIGURE_MAXIMUM_PROCESSORS >= 21 1037 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1052 , _CONFIGURE_SCHEDULER_ASSIGN 1038 1053 #endif 1039 1054 #if CONFIGURE_MAXIMUM_PROCESSORS >= 22 1040 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1055 , _CONFIGURE_SCHEDULER_ASSIGN 1041 1056 #endif 1042 1057 #if CONFIGURE_MAXIMUM_PROCESSORS >= 23 1043 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1058 , _CONFIGURE_SCHEDULER_ASSIGN 1044 1059 #endif 1045 1060 #if CONFIGURE_MAXIMUM_PROCESSORS >= 24 1046 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1061 , _CONFIGURE_SCHEDULER_ASSIGN 1047 1062 #endif 1048 1063 #if CONFIGURE_MAXIMUM_PROCESSORS >= 25 1049 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1064 , _CONFIGURE_SCHEDULER_ASSIGN 1050 1065 #endif 1051 1066 #if CONFIGURE_MAXIMUM_PROCESSORS >= 26 1052 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1067 , _CONFIGURE_SCHEDULER_ASSIGN 1053 1068 #endif 1054 1069 #if CONFIGURE_MAXIMUM_PROCESSORS >= 27 1055 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1070 , _CONFIGURE_SCHEDULER_ASSIGN 1056 1071 #endif 1057 1072 #if CONFIGURE_MAXIMUM_PROCESSORS >= 28 1058 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1073 , _CONFIGURE_SCHEDULER_ASSIGN 1059 1074 #endif 1060 1075 #if CONFIGURE_MAXIMUM_PROCESSORS >= 29 1061 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1076 , _CONFIGURE_SCHEDULER_ASSIGN 1062 1077 #endif 1063 1078 #if CONFIGURE_MAXIMUM_PROCESSORS >= 30 1064 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1079 , _CONFIGURE_SCHEDULER_ASSIGN 1065 1080 #endif 1066 1081 #if CONFIGURE_MAXIMUM_PROCESSORS >= 31 1067 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1082 , _CONFIGURE_SCHEDULER_ASSIGN 1068 1083 #endif 1069 1084 #if CONFIGURE_MAXIMUM_PROCESSORS >= 32 1070 , _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1071 #endif 1072 #undef _CONFIGURE_S MP_SCHEDULER_ASSIGN_OPT1085 , _CONFIGURE_SCHEDULER_ASSIGN 1086 #endif 1087 #undef _CONFIGURE_SCHEDULER_ASSIGN 1073 1088 #endif 1074 1089 }; -
cpukit/include/rtems/scheduler.h
r4dfeba3 r2ef85b1 64 64 SCHEDULER_CONTEXT_NAME( CBS_ ## name ) 65 65 66 #define RTEMS_SCHEDULER_C ONTEXT_CBS( name ) \66 #define RTEMS_SCHEDULER_CBS( name ) \ 67 67 static Scheduler_EDF_Context SCHEDULER_CBS_CONTEXT_NAME( name ) 68 68 69 #define RTEMS_SCHEDULER_ CONTROL_CBS( name, obj_name ) \69 #define RTEMS_SCHEDULER_TABLE_CBS( name, obj_name ) \ 70 70 { \ 71 71 &SCHEDULER_CBS_CONTEXT_NAME( name ).Base, \ … … 74 74 ( obj_name ) \ 75 75 } 76 77 /* Provided for backward compatibility */ 78 79 #define RTEMS_SCHEDULER_CONTEXT_CBS( name ) \ 80 RTEMS_SCHEDULER_CBS( name ) 81 82 #define RTEMS_SCHEDULER_CONTROL_CBS( name, obj_name ) \ 83 RTEMS_SCHEDULER_TABLE_CBS( name, obj_name ) 76 84 #endif 77 85 … … 82 90 SCHEDULER_CONTEXT_NAME( EDF_ ## name ) 83 91 84 #define RTEMS_SCHEDULER_ CONTEXT_EDF( name ) \92 #define RTEMS_SCHEDULER_EDF( name ) \ 85 93 static Scheduler_EDF_Context SCHEDULER_EDF_CONTEXT_NAME( name ) 86 94 87 #define RTEMS_SCHEDULER_ CONTROL_EDF( name, obj_name ) \95 #define RTEMS_SCHEDULER_TABLE_EDF( name, obj_name ) \ 88 96 { \ 89 97 &SCHEDULER_EDF_CONTEXT_NAME( name ).Base, \ … … 92 100 ( obj_name ) \ 93 101 } 102 103 /* Provided for backward compatibility */ 104 105 #define RTEMS_SCHEDULER_CONTEXT_EDF( name ) \ 106 RTEMS_SCHEDULER_EDF( name ) 107 108 #define RTEMS_SCHEDULER_CONTROL_EDF( name, obj_name ) \ 109 RTEMS_SCHEDULER_TABLE_EDF( name, obj_name ) 94 110 #endif 95 111 … … 100 116 SCHEDULER_CONTEXT_NAME( EDF_SMP_ ## name ) 101 117 102 #define RTEMS_SCHEDULER_ CONTEXT_EDF_SMP( name, max_cpu_count ) \118 #define RTEMS_SCHEDULER_EDF_SMP( name, max_cpu_count ) \ 103 119 static struct { \ 104 120 Scheduler_EDF_SMP_Context Base; \ … … 106 122 } SCHEDULER_EDF_SMP_CONTEXT_NAME( name ) 107 123 108 #define RTEMS_SCHEDULER_ CONTROL_EDF_SMP( name, obj_name ) \124 #define RTEMS_SCHEDULER_TABLE_EDF_SMP( name, obj_name ) \ 109 125 { \ 110 126 &SCHEDULER_EDF_SMP_CONTEXT_NAME( name ).Base.Base.Base, \ … … 113 129 ( obj_name ) \ 114 130 } 131 132 /* Provided for backward compatibility */ 133 134 #define RTEMS_SCHEDULER_CONTEXT_EDF_SMP( name, max_cpu_count ) \ 135 RTEMS_SCHEDULER_EDF_SMP( name, max_cpu_count ) 136 137 #define RTEMS_SCHEDULER_CONTROL_EDF_SMP( name, obj_name ) \ 138 RTEMS_SCHEDULER_TABLE_EDF_SMP( name, obj_name ) 115 139 #endif 116 140 … … 121 145 SCHEDULER_CONTEXT_NAME( priority_ ## name ) 122 146 123 #define RTEMS_SCHEDULER_ CONTEXT_PRIORITY( name, prio_count ) \147 #define RTEMS_SCHEDULER_PRIORITY( name, prio_count ) \ 124 148 static struct { \ 125 149 Scheduler_priority_Context Base; \ … … 127 151 } SCHEDULER_PRIORITY_CONTEXT_NAME( name ) 128 152 129 #define RTEMS_SCHEDULER_ CONTROL_PRIORITY( name, obj_name ) \153 #define RTEMS_SCHEDULER_TABLE_PRIORITY( name, obj_name ) \ 130 154 { \ 131 155 &SCHEDULER_PRIORITY_CONTEXT_NAME( name ).Base.Base, \ … … 136 160 ( obj_name ) \ 137 161 } 162 163 /* Provided for backward compatibility */ 164 165 #define RTEMS_SCHEDULER_CONTEXT_PRIORITY( name, prio_count ) \ 166 RTEMS_SCHEDULER_PRIORITY( name, prio_count ) 167 168 #define RTEMS_SCHEDULER_CONTROL_PRIORITY( name, obj_name ) \ 169 RTEMS_SCHEDULER_TABLE_PRIORITY( name, obj_name ) 138 170 #endif 139 171 … … 144 176 SCHEDULER_CONTEXT_NAME( priority_affinity_SMP_ ## name ) 145 177 146 #define RTEMS_SCHEDULER_ CONTEXT_PRIORITY_AFFINITY_SMP( name, prio_count ) \178 #define RTEMS_SCHEDULER_PRIORITY_AFFINITY_SMP( name, prio_count ) \ 147 179 static struct { \ 148 180 Scheduler_priority_SMP_Context Base; \ … … 150 182 } SCHEDULER_PRIORITY_AFFINITY_SMP_CONTEXT_NAME( name ) 151 183 152 #define RTEMS_SCHEDULER_ CONTROL_PRIORITY_AFFINITY_SMP( name, obj_name ) \184 #define RTEMS_SCHEDULER_TABLE_PRIORITY_AFFINITY_SMP( name, obj_name ) \ 153 185 { \ 154 186 &SCHEDULER_PRIORITY_AFFINITY_SMP_CONTEXT_NAME( name ).Base.Base.Base, \ … … 159 191 ( obj_name ) \ 160 192 } 193 194 /* Provided for backward compatibility */ 195 196 #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP( name, prio_count ) \ 197 RTEMS_SCHEDULER_PRIORITY_AFFINITY_SMP( name, prio_count ) 198 199 #define RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( name, obj_name ) \ 200 RTEMS_SCHEDULER_TABLE_PRIORITY_AFFINITY_SMP( name, obj_name ) 161 201 #endif 162 202 … … 167 207 SCHEDULER_CONTEXT_NAME( priority_SMP_ ## name ) 168 208 169 #define RTEMS_SCHEDULER_ CONTEXT_PRIORITY_SMP( name, prio_count ) \209 #define RTEMS_SCHEDULER_PRIORITY_SMP( name, prio_count ) \ 170 210 static struct { \ 171 211 Scheduler_priority_SMP_Context Base; \ … … 173 213 } SCHEDULER_PRIORITY_SMP_CONTEXT_NAME( name ) 174 214 175 #define RTEMS_SCHEDULER_ CONTROL_PRIORITY_SMP( name, obj_name ) \215 #define RTEMS_SCHEDULER_TABLE_PRIORITY_SMP( name, obj_name ) \ 176 216 { \ 177 217 &SCHEDULER_PRIORITY_SMP_CONTEXT_NAME( name ).Base.Base.Base, \ … … 182 222 ( obj_name ) \ 183 223 } 224 225 /* Provided for backward compatibility */ 226 227 #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP( name, prio_count ) \ 228 RTEMS_SCHEDULER_PRIORITY_SMP( name, prio_count ) 229 230 #define RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP( name, obj_name ) \ 231 RTEMS_SCHEDULER_TABLE_PRIORITY_SMP( name, obj_name ) 184 232 #endif 185 233 … … 190 238 SCHEDULER_CONTEXT_NAME( strong_APA_ ## name ) 191 239 192 #define RTEMS_SCHEDULER_ CONTEXT_STRONG_APA( name, prio_count ) \240 #define RTEMS_SCHEDULER_STRONG_APA( name, prio_count ) \ 193 241 static struct { \ 194 242 Scheduler_strong_APA_Context Base; \ … … 196 244 } SCHEDULER_STRONG_APA_CONTEXT_NAME( name ) 197 245 198 #define RTEMS_SCHEDULER_ CONTROL_STRONG_APA( name, obj_name ) \246 #define RTEMS_SCHEDULER_TABLE_STRONG_APA( name, obj_name ) \ 199 247 { \ 200 248 &SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Base.Base.Base, \ … … 205 253 ( obj_name ) \ 206 254 } 255 256 /* Provided for backward compatibility */ 257 258 #define RTEMS_SCHEDULER_CONTEXT_STRONG_APA( name, prio_count ) \ 259 RTEMS_SCHEDULER_STRONG_APA( name, prio_count ) 260 261 #define RTEMS_SCHEDULER_CONTROL_STRONG_APA( name, obj_name ) \ 262 RTEMS_SCHEDULER_TABLE_STRONG_APA( name, obj_name ) 207 263 #endif 208 264 … … 213 269 SCHEDULER_CONTEXT_NAME( simple_ ## name ) 214 270 215 #define RTEMS_SCHEDULER_ CONTEXT_SIMPLE( name ) \271 #define RTEMS_SCHEDULER_SIMPLE( name ) \ 216 272 static Scheduler_simple_Context \ 217 273 SCHEDULER_SIMPLE_CONTEXT_NAME( name ) 218 274 219 #define RTEMS_SCHEDULER_ CONTROL_SIMPLE( name, obj_name ) \275 #define RTEMS_SCHEDULER_TABLE_SIMPLE( name, obj_name ) \ 220 276 { \ 221 277 &SCHEDULER_SIMPLE_CONTEXT_NAME( name ).Base, \ … … 224 280 ( obj_name ) \ 225 281 } 282 283 /* Provided for backward compatibility */ 284 285 #define RTEMS_SCHEDULER_CONTEXT_SIMPLE( name ) \ 286 RTEMS_SCHEDULER_SIMPLE( name ) 287 288 #define RTEMS_SCHEDULER_CONTROL_SIMPLE( name, obj_name ) \ 289 RTEMS_SCHEDULER_TABLE_SIMPLE( name, obj_name ) 226 290 #endif 227 291 … … 232 296 SCHEDULER_CONTEXT_NAME( simple_SMP_ ## name ) 233 297 234 #define RTEMS_SCHEDULER_ CONTEXT_SIMPLE_SMP( name ) \298 #define RTEMS_SCHEDULER_SIMPLE_SMP( name ) \ 235 299 static Scheduler_simple_SMP_Context \ 236 300 SCHEDULER_SIMPLE_SMP_CONTEXT_NAME( name ) 237 301 238 #define RTEMS_SCHEDULER_ CONTROL_SIMPLE_SMP( name, obj_name ) \302 #define RTEMS_SCHEDULER_TABLE_SIMPLE_SMP( name, obj_name ) \ 239 303 { \ 240 304 &SCHEDULER_SIMPLE_SMP_CONTEXT_NAME( name ).Base.Base, \ … … 243 307 ( obj_name ) \ 244 308 } 309 310 /* Provided for backward compatibility */ 311 312 #define RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP( name ) \ 313 RTEMS_SCHEDULER_SIMPLE_SMP( name ) 314 315 #define RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP( name, obj_name ) \ 316 RTEMS_SCHEDULER_TABLE_SIMPLE_SMP( name, obj_name ) 245 317 #endif 246 318
Note: See TracChangeset
for help on using the changeset viewer.