Changeset 0231ebc in rtems


Ignore:
Timestamp:
Mar 7, 2018, 3:29:52 PM (14 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
828049cb
Parents:
d39cc068
git-author:
Sebastian Huber <sebastian.huber@…> (03/07/18 15:29:52)
git-committer:
Sebastian Huber <sebastian.huber@…> (03/08/18 06:05:07)
Message:

config: Remove RTEMS prefix from internal defines

Update #3325.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/include/rtems/scheduler.h

    rd39cc068 r0231ebc  
    66
    77/*
    8  * Copyright (c) 2014, 2017 embedded brains GmbH.  All rights reserved.
     8 * Copyright (c) 2014, 2018 embedded brains GmbH.  All rights reserved.
    99 *
    1010 *  embedded brains GmbH
     
    2424#include <rtems/score/scheduler.h>
    2525
    26 #define RTEMS_SCHEDULER_CONTEXT_NAME( name ) \
     26#define SCHEDULER_CONTEXT_NAME( name ) \
    2727  _Configuration_Scheduler_ ## name
    2828
     
    6161  #include <rtems/score/schedulercbs.h>
    6262
    63   #define RTEMS_SCHEDULER_CONTEXT_CBS_NAME( name ) \
    64     RTEMS_SCHEDULER_CONTEXT_NAME( CBS_ ## name )
     63  #define SCHEDULER_CBS_CONTEXT_NAME( name ) \
     64    SCHEDULER_CONTEXT_NAME( CBS_ ## name )
    6565
    6666  #define RTEMS_SCHEDULER_CONTEXT_CBS( name ) \
    67     static Scheduler_EDF_Context RTEMS_SCHEDULER_CONTEXT_CBS_NAME( name )
     67    static Scheduler_EDF_Context SCHEDULER_CBS_CONTEXT_NAME( name )
    6868
    6969  #define RTEMS_SCHEDULER_CONTROL_CBS( name, obj_name ) \
    7070    { \
    71       &RTEMS_SCHEDULER_CONTEXT_CBS_NAME( name ).Base, \
     71      &SCHEDULER_CBS_CONTEXT_NAME( name ).Base, \
    7272      SCHEDULER_CBS_ENTRY_POINTS, \
    7373      SCHEDULER_CBS_MAXIMUM_PRIORITY, \
     
    7979  #include <rtems/score/scheduleredf.h>
    8080
    81   #define RTEMS_SCHEDULER_CONTEXT_EDF_NAME( name ) \
    82     RTEMS_SCHEDULER_CONTEXT_NAME( EDF_ ## name )
     81  #define SCHEDULER_EDF_CONTEXT_NAME( name ) \
     82    SCHEDULER_CONTEXT_NAME( EDF_ ## name )
    8383
    8484  #define RTEMS_SCHEDULER_CONTEXT_EDF( name ) \
    85     static Scheduler_EDF_Context RTEMS_SCHEDULER_CONTEXT_EDF_NAME( name )
     85    static Scheduler_EDF_Context SCHEDULER_EDF_CONTEXT_NAME( name )
    8686
    8787  #define RTEMS_SCHEDULER_CONTROL_EDF( name, obj_name ) \
    8888    { \
    89       &RTEMS_SCHEDULER_CONTEXT_EDF_NAME( name ).Base, \
     89      &SCHEDULER_EDF_CONTEXT_NAME( name ).Base, \
    9090      SCHEDULER_EDF_ENTRY_POINTS, \
    9191      SCHEDULER_EDF_MAXIMUM_PRIORITY, \
     
    9797  #include <rtems/score/scheduleredfsmp.h>
    9898
    99   #define RTEMS_SCHEDULER_CONTEXT_EDF_SMP_NAME( name ) \
    100     RTEMS_SCHEDULER_CONTEXT_NAME( EDF_SMP_ ## name )
     99  #define SCHEDULER_EDF_SMP_CONTEXT_NAME( name ) \
     100    SCHEDULER_CONTEXT_NAME( EDF_SMP_ ## name )
    101101
    102102  #define RTEMS_SCHEDULER_CONTEXT_EDF_SMP( name, max_cpu_count ) \
     
    104104      Scheduler_EDF_SMP_Context Base; \
    105105      Scheduler_EDF_SMP_Ready_queue Ready[ ( max_cpu_count ) + 1 ]; \
    106     } RTEMS_SCHEDULER_CONTEXT_EDF_SMP_NAME( name )
     106    } SCHEDULER_EDF_SMP_CONTEXT_NAME( name )
    107107
    108108  #define RTEMS_SCHEDULER_CONTROL_EDF_SMP( name, obj_name ) \
    109109    { \
    110       &RTEMS_SCHEDULER_CONTEXT_EDF_SMP_NAME( name ).Base.Base.Base, \
     110      &SCHEDULER_EDF_SMP_CONTEXT_NAME( name ).Base.Base.Base, \
    111111      SCHEDULER_EDF_SMP_ENTRY_POINTS, \
    112112      SCHEDULER_EDF_MAXIMUM_PRIORITY, \
     
    118118  #include <rtems/score/schedulerpriority.h>
    119119
    120   #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_NAME( name ) \
    121     RTEMS_SCHEDULER_CONTEXT_NAME( priority_ ## name )
     120  #define SCHEDULER_PRIORITY_CONTEXT_NAME( name ) \
     121    SCHEDULER_CONTEXT_NAME( priority_ ## name )
    122122
    123123  #define RTEMS_SCHEDULER_CONTEXT_PRIORITY( name, prio_count ) \
     
    125125      Scheduler_priority_Context Base; \
    126126      Chain_Control              Ready[ ( prio_count ) ]; \
    127     } RTEMS_SCHEDULER_CONTEXT_PRIORITY_NAME( name )
     127    } SCHEDULER_PRIORITY_CONTEXT_NAME( name )
    128128
    129129  #define RTEMS_SCHEDULER_CONTROL_PRIORITY( name, obj_name ) \
    130130    { \
    131       &RTEMS_SCHEDULER_CONTEXT_PRIORITY_NAME( name ).Base.Base, \
     131      &SCHEDULER_PRIORITY_CONTEXT_NAME( name ).Base.Base, \
    132132      SCHEDULER_PRIORITY_ENTRY_POINTS, \
    133133      RTEMS_ARRAY_SIZE( \
    134         RTEMS_SCHEDULER_CONTEXT_PRIORITY_NAME( name ).Ready \
     134        SCHEDULER_PRIORITY_CONTEXT_NAME( name ).Ready \
    135135      ) - 1, \
    136136      ( obj_name ) \
     
    141141  #include <rtems/score/schedulerpriorityaffinitysmp.h>
    142142
    143   #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP_NAME( name ) \
    144     RTEMS_SCHEDULER_CONTEXT_NAME( priority_affinity_SMP_ ## name )
     143  #define SCHEDULER_PRIORITY_AFFINITY_SMP_CONTEXT_NAME( name ) \
     144    SCHEDULER_CONTEXT_NAME( priority_affinity_SMP_ ## name )
    145145
    146146  #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP( name, prio_count ) \
     
    148148      Scheduler_priority_SMP_Context Base; \
    149149      Chain_Control                  Ready[ ( prio_count ) ]; \
    150     } RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP_NAME( name )
     150    } SCHEDULER_PRIORITY_AFFINITY_SMP_CONTEXT_NAME( name )
    151151
    152152  #define RTEMS_SCHEDULER_CONTROL_PRIORITY_AFFINITY_SMP( name, obj_name ) \
    153153    { \
    154       &RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP_NAME( name ).Base.Base.Base, \
     154      &SCHEDULER_PRIORITY_AFFINITY_SMP_CONTEXT_NAME( name ).Base.Base.Base, \
    155155      SCHEDULER_PRIORITY_AFFINITY_SMP_ENTRY_POINTS, \
    156156      RTEMS_ARRAY_SIZE( \
    157         RTEMS_SCHEDULER_CONTEXT_PRIORITY_AFFINITY_SMP_NAME( name ).Ready \
     157        SCHEDULER_PRIORITY_AFFINITY_SMP_CONTEXT_NAME( name ).Ready \
    158158      ) - 1, \
    159159      ( obj_name ) \
     
    164164  #include <rtems/score/schedulerprioritysmp.h>
    165165
    166   #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP_NAME( name ) \
    167     RTEMS_SCHEDULER_CONTEXT_NAME( priority_SMP_ ## name )
     166  #define SCHEDULER_PRIORITY_SMP_CONTEXT_NAME( name ) \
     167    SCHEDULER_CONTEXT_NAME( priority_SMP_ ## name )
    168168
    169169  #define RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP( name, prio_count ) \
     
    171171      Scheduler_priority_SMP_Context Base; \
    172172      Chain_Control                  Ready[ ( prio_count ) ]; \
    173     } RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP_NAME( name )
     173    } SCHEDULER_PRIORITY_SMP_CONTEXT_NAME( name )
    174174
    175175  #define RTEMS_SCHEDULER_CONTROL_PRIORITY_SMP( name, obj_name ) \
    176176    { \
    177       &RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP_NAME( name ).Base.Base.Base, \
     177      &SCHEDULER_PRIORITY_SMP_CONTEXT_NAME( name ).Base.Base.Base, \
    178178      SCHEDULER_PRIORITY_SMP_ENTRY_POINTS, \
    179179      RTEMS_ARRAY_SIZE( \
    180         RTEMS_SCHEDULER_CONTEXT_PRIORITY_SMP_NAME( name ).Ready \
     180        SCHEDULER_PRIORITY_SMP_CONTEXT_NAME( name ).Ready \
    181181      ) - 1, \
    182182      ( obj_name ) \
     
    187187  #include <rtems/score/schedulerstrongapa.h>
    188188
    189   #define RTEMS_SCHEDULER_CONTEXT_STRONG_APA_NAME( name ) \
    190     RTEMS_SCHEDULER_CONTEXT_NAME( strong_APA_ ## name )
     189  #define SCHEDULER_STRONG_APA_CONTEXT_NAME( name ) \
     190    SCHEDULER_CONTEXT_NAME( strong_APA_ ## name )
    191191
    192192  #define RTEMS_SCHEDULER_CONTEXT_STRONG_APA( name, prio_count ) \
     
    194194      Scheduler_strong_APA_Context Base; \
    195195      Chain_Control                Ready[ ( prio_count ) ]; \
    196     } RTEMS_SCHEDULER_CONTEXT_STRONG_APA_NAME( name )
     196    } SCHEDULER_STRONG_APA_CONTEXT_NAME( name )
    197197
    198198  #define RTEMS_SCHEDULER_CONTROL_STRONG_APA( name, obj_name ) \
    199199    { \
    200       &RTEMS_SCHEDULER_CONTEXT_STRONG_APA_NAME( name ).Base.Base.Base, \
     200      &SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Base.Base.Base, \
    201201      SCHEDULER_STRONG_APA_ENTRY_POINTS, \
    202202      RTEMS_ARRAY_SIZE( \
    203         RTEMS_SCHEDULER_CONTEXT_STRONG_APA_NAME( name ).Ready \
     203        SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Ready \
    204204      ) - 1, \
    205205      ( obj_name ) \
     
    210210  #include <rtems/score/schedulersimple.h>
    211211
    212   #define RTEMS_SCHEDULER_CONTEXT_SIMPLE_NAME( name ) \
    213     RTEMS_SCHEDULER_CONTEXT_NAME( simple_ ## name )
     212  #define SCHEDULER_SIMPLE_CONTEXT_NAME( name ) \
     213    SCHEDULER_CONTEXT_NAME( simple_ ## name )
    214214
    215215  #define RTEMS_SCHEDULER_CONTEXT_SIMPLE( name ) \
    216216    static Scheduler_simple_Context \
    217       RTEMS_SCHEDULER_CONTEXT_SIMPLE_NAME( name )
     217      SCHEDULER_SIMPLE_CONTEXT_NAME( name )
    218218
    219219  #define RTEMS_SCHEDULER_CONTROL_SIMPLE( name, obj_name ) \
    220220    { \
    221       &RTEMS_SCHEDULER_CONTEXT_SIMPLE_NAME( name ).Base, \
     221      &SCHEDULER_SIMPLE_CONTEXT_NAME( name ).Base, \
    222222      SCHEDULER_SIMPLE_ENTRY_POINTS, \
    223223      SCHEDULER_SIMPLE_MAXIMUM_PRIORITY, \
     
    229229  #include <rtems/score/schedulersimplesmp.h>
    230230
    231   #define RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP_NAME( name ) \
    232     RTEMS_SCHEDULER_CONTEXT_NAME( simple_SMP_ ## name )
     231  #define SCHEDULER_SIMPLE_SMP_CONTEXT_NAME( name ) \
     232    SCHEDULER_CONTEXT_NAME( simple_SMP_ ## name )
    233233
    234234  #define RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP( name ) \
    235235    static Scheduler_simple_SMP_Context \
    236       RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP_NAME( name )
     236      SCHEDULER_SIMPLE_SMP_CONTEXT_NAME( name )
    237237
    238238  #define RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP( name, obj_name ) \
    239239    { \
    240       &RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP_NAME( name ).Base.Base, \
     240      &SCHEDULER_SIMPLE_SMP_CONTEXT_NAME( name ).Base.Base, \
    241241      SCHEDULER_SIMPLE_SMP_ENTRY_POINTS, \
    242242      SCHEDULER_SIMPLE_SMP_MAXIMUM_PRIORITY, \
Note: See TracChangeset for help on using the changeset viewer.