Changeset 04dba49 in rtems


Ignore:
Timestamp:
Oct 19, 2006, 7:20:10 PM (13 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
24029b2
Parents:
e307735
Message:

2006-10-19 Joel Sherrill <joel@…>

  • configure.ac, itron/Makefile.am, itron/preinstall.am, posix/Makefile.am, posix/preinstall.am, rtems/Makefile.am, rtems/preinstall.am, sapi/Makefile.am, sapi/preinstall.am, score/Makefile.am, score/preinstall.am, score/include/rtems/system.h, score/include/rtems/score/chain.h, score/include/rtems/score/thread.h, score/src/chain.c, score/src/coremutexseize.c, score/src/threadget.c: Remove all macro implementations and use only the static inline. Static inline functions are now well supported so there is no reason for duplicate maintenance.
  • itron/macros/rtems/itron/eventflags.inl, itron/macros/rtems/itron/fmempool.inl, itron/macros/rtems/itron/intr.inl, itron/macros/rtems/itron/mbox.inl, itron/macros/rtems/itron/msgbuffer.inl, itron/macros/rtems/itron/network.inl, itron/macros/rtems/itron/port.inl, itron/macros/rtems/itron/semaphore.inl, itron/macros/rtems/itron/sysmgmt.inl, itron/macros/rtems/itron/task.inl, itron/macros/rtems/itron/time.inl, itron/macros/rtems/itron/vmempool.inl, posix/macros/rtems/posix/cond.inl, posix/macros/rtems/posix/key.inl, posix/macros/rtems/posix/mqueue.inl, posix/macros/rtems/posix/mutex.inl, posix/macros/rtems/posix/priority.inl, posix/macros/rtems/posix/pthread.inl, posix/macros/rtems/posix/semaphore.inl, posix/macros/rtems/posix/timer.inl, rtems/macros/rtems/rtems/asr.inl, rtems/macros/rtems/rtems/attr.inl, rtems/macros/rtems/rtems/barrier.inl, rtems/macros/rtems/rtems/dpmem.inl, rtems/macros/rtems/rtems/event.inl, rtems/macros/rtems/rtems/eventset.inl, rtems/macros/rtems/rtems/message.inl, rtems/macros/rtems/rtems/modes.inl, rtems/macros/rtems/rtems/options.inl, rtems/macros/rtems/rtems/part.inl, rtems/macros/rtems/rtems/ratemon.inl, rtems/macros/rtems/rtems/region.inl, rtems/macros/rtems/rtems/sem.inl, rtems/macros/rtems/rtems/status.inl, rtems/macros/rtems/rtems/support.inl, rtems/macros/rtems/rtems/tasks.inl, rtems/macros/rtems/rtems/timer.inl, sapi/macros/rtems/extension.inl, score/macros/README, score/macros/rtems/score/address.inl, score/macros/rtems/score/chain.inl, score/macros/rtems/score/corebarrier.inl, score/macros/rtems/score/coremsg.inl, score/macros/rtems/score/coremutex.inl, score/macros/rtems/score/corerwlock.inl, score/macros/rtems/score/coresem.inl, score/macros/rtems/score/corespinlock.inl, score/macros/rtems/score/heap.inl, score/macros/rtems/score/isr.inl, score/macros/rtems/score/mppkt.inl, score/macros/rtems/score/object.inl, score/macros/rtems/score/objectmp.inl, score/macros/rtems/score/priority.inl, score/macros/rtems/score/stack.inl, score/macros/rtems/score/states.inl, score/macros/rtems/score/sysstate.inl, score/macros/rtems/score/thread.inl, score/macros/rtems/score/threadmp.inl, score/macros/rtems/score/tod.inl, score/macros/rtems/score/tqdata.inl, score/macros/rtems/score/userext.inl, score/macros/rtems/score/watchdog.inl, score/macros/rtems/score/wkspace.inl: Removed.
Location:
cpukit
Files:
63 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    re307735 r04dba49  
     12006-10-19      Joel Sherrill <joel@OARcorp.com>
     2
     3        * configure.ac, itron/Makefile.am, itron/preinstall.am,
     4        posix/Makefile.am, posix/preinstall.am, rtems/Makefile.am,
     5        rtems/preinstall.am, sapi/Makefile.am, sapi/preinstall.am,
     6        score/Makefile.am, score/preinstall.am, score/include/rtems/system.h,
     7        score/include/rtems/score/chain.h,
     8        score/include/rtems/score/thread.h, score/src/chain.c,
     9        score/src/coremutexseize.c, score/src/threadget.c: Remove all macro
     10        implementations and use only the static inline. Static inline
     11        functions are now well supported so there is no reason for duplicate
     12        maintenance.
     13        * itron/macros/rtems/itron/eventflags.inl,
     14        itron/macros/rtems/itron/fmempool.inl,
     15        itron/macros/rtems/itron/intr.inl, itron/macros/rtems/itron/mbox.inl,
     16        itron/macros/rtems/itron/msgbuffer.inl,
     17        itron/macros/rtems/itron/network.inl,
     18        itron/macros/rtems/itron/port.inl,
     19        itron/macros/rtems/itron/semaphore.inl,
     20        itron/macros/rtems/itron/sysmgmt.inl,
     21        itron/macros/rtems/itron/task.inl, itron/macros/rtems/itron/time.inl,
     22        itron/macros/rtems/itron/vmempool.inl,
     23        posix/macros/rtems/posix/cond.inl, posix/macros/rtems/posix/key.inl,
     24        posix/macros/rtems/posix/mqueue.inl,
     25        posix/macros/rtems/posix/mutex.inl,
     26        posix/macros/rtems/posix/priority.inl,
     27        posix/macros/rtems/posix/pthread.inl,
     28        posix/macros/rtems/posix/semaphore.inl,
     29        posix/macros/rtems/posix/timer.inl, rtems/macros/rtems/rtems/asr.inl,
     30        rtems/macros/rtems/rtems/attr.inl,
     31        rtems/macros/rtems/rtems/barrier.inl,
     32        rtems/macros/rtems/rtems/dpmem.inl,
     33        rtems/macros/rtems/rtems/event.inl,
     34        rtems/macros/rtems/rtems/eventset.inl,
     35        rtems/macros/rtems/rtems/message.inl,
     36        rtems/macros/rtems/rtems/modes.inl,
     37        rtems/macros/rtems/rtems/options.inl,
     38        rtems/macros/rtems/rtems/part.inl,
     39        rtems/macros/rtems/rtems/ratemon.inl,
     40        rtems/macros/rtems/rtems/region.inl,
     41        rtems/macros/rtems/rtems/sem.inl,
     42        rtems/macros/rtems/rtems/status.inl,
     43        rtems/macros/rtems/rtems/support.inl,
     44        rtems/macros/rtems/rtems/tasks.inl,
     45        rtems/macros/rtems/rtems/timer.inl, sapi/macros/rtems/extension.inl,
     46        score/macros/README, score/macros/rtems/score/address.inl,
     47        score/macros/rtems/score/chain.inl,
     48        score/macros/rtems/score/corebarrier.inl,
     49        score/macros/rtems/score/coremsg.inl,
     50        score/macros/rtems/score/coremutex.inl,
     51        score/macros/rtems/score/corerwlock.inl,
     52        score/macros/rtems/score/coresem.inl,
     53        score/macros/rtems/score/corespinlock.inl,
     54        score/macros/rtems/score/heap.inl, score/macros/rtems/score/isr.inl,
     55        score/macros/rtems/score/mppkt.inl,
     56        score/macros/rtems/score/object.inl,
     57        score/macros/rtems/score/objectmp.inl,
     58        score/macros/rtems/score/priority.inl,
     59        score/macros/rtems/score/stack.inl,
     60        score/macros/rtems/score/states.inl,
     61        score/macros/rtems/score/sysstate.inl,
     62        score/macros/rtems/score/thread.inl,
     63        score/macros/rtems/score/threadmp.inl,
     64        score/macros/rtems/score/tod.inl,
     65        score/macros/rtems/score/tqdata.inl,
     66        score/macros/rtems/score/userext.inl,
     67        score/macros/rtems/score/watchdog.inl,
     68        score/macros/rtems/score/wkspace.inl: Removed.
     69
    1702006-10-18      Ralf Corsépius <ralf.corsepius@rtems.org>
    271
  • cpukit/configure.ac

    re307735 r04dba49  
    1717RTEMS_ENABLE_POSIX
    1818RTEMS_ENABLE_ITRON
    19 RTEMS_ENABLE_INLINES
    2019RTEMS_ENABLE_RTEMS_DEBUG
    2120RTEMS_ENABLE_NETWORKING
     
    143142  [1],
    144143  [if RTEMS_DEBUG is enabled])
    145 
    146 RTEMS_CPUOPT([RTEMS_INLINES],
    147   [test x"${enable_rtems_inlines}" = x"yes"],
    148   [1],
    149   [if using inlines])
    150144
    151145RTEMS_CPUOPT([RTEMS_ITRON_API],
     
    262256AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
    263257
    264 AM_CONDITIONAL(INLINE,test x"$enable_rtems_inlines" = x"yes" )
    265 AM_CONDITIONAL(MACROS,test x"$enable_rtems_inlines" = x"no" )
    266258AM_CONDITIONAL(HAS_MP,test x"$enable_multiprocessing" = x"yes" )
    267259
  • cpukit/itron/Makefile.am

    re307735 r04dba49  
    4545## Inline
    4646
    47 if INLINE
    4847include_rtems_itron_HEADERS += inline/rtems/itron/eventflags.inl \
    4948    inline/rtems/itron/fmempool.inl inline/rtems/itron/intr.inl \
     
    5352    inline/rtems/itron/task.inl inline/rtems/itron/time.inl \
    5453    inline/rtems/itron/vmempool.inl
    55 else
    56 include_rtems_itron_HEADERS += macros/rtems/itron/eventflags.inl \
    57     macros/rtems/itron/fmempool.inl macros/rtems/itron/intr.inl \
    58     macros/rtems/itron/mbox.inl macros/rtems/itron/msgbuffer.inl \
    59     macros/rtems/itron/network.inl macros/rtems/itron/port.inl \
    60     macros/rtems/itron/semaphore.inl macros/rtems/itron/sysmgmt.inl \
    61     macros/rtems/itron/task.inl macros/rtems/itron/time.inl \
    62     macros/rtems/itron/vmempool.inl
    63 endif
    6454
    6555## Sources
  • cpukit/itron/preinstall.am

    re307735 r04dba49  
    150150PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.h
    151151
    152 if INLINE
    153152$(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: inline/rtems/itron/eventflags.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    154153        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
     
    198197        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
    199198PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
    200 
    201 else
    202 $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: macros/rtems/itron/eventflags.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    203         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
    204 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
    205 
    206 $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl: macros/rtems/itron/fmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    207         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl
    208 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl
    209 
    210 $(PROJECT_INCLUDE)/rtems/itron/intr.inl: macros/rtems/itron/intr.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    211         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/intr.inl
    212 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/intr.inl
    213 
    214 $(PROJECT_INCLUDE)/rtems/itron/mbox.inl: macros/rtems/itron/mbox.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    215         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/mbox.inl
    216 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/mbox.inl
    217 
    218 $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl: macros/rtems/itron/msgbuffer.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    219         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl
    220 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl
    221 
    222 $(PROJECT_INCLUDE)/rtems/itron/network.inl: macros/rtems/itron/network.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    223         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/network.inl
    224 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/network.inl
    225 
    226 $(PROJECT_INCLUDE)/rtems/itron/port.inl: macros/rtems/itron/port.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    227         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/port.inl
    228 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/port.inl
    229 
    230 $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl: macros/rtems/itron/semaphore.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    231         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl
    232 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl
    233 
    234 $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl: macros/rtems/itron/sysmgmt.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    235         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl
    236 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl
    237 
    238 $(PROJECT_INCLUDE)/rtems/itron/task.inl: macros/rtems/itron/task.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    239         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/task.inl
    240 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/task.inl
    241 
    242 $(PROJECT_INCLUDE)/rtems/itron/time.inl: macros/rtems/itron/time.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    243         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/time.inl
    244 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/time.inl
    245 
    246 $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: macros/rtems/itron/vmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
    247         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
    248 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
    249199endif
    250 endif
  • cpukit/posix/Makefile.am

    re307735 r04dba49  
    3434endif
    3535
    36 if INLINE
    3736include_rtems_posix_HEADERS += inline/rtems/posix/cond.inl \
    3837    inline/rtems/posix/key.inl inline/rtems/posix/mqueue.inl \
     
    4039    inline/rtems/posix/priority.inl inline/rtems/posix/semaphore.inl \
    4140    inline/rtems/posix/timer.inl
    42 else
    43 include_rtems_posix_HEADERS += macros/rtems/posix/cond.inl \
    44     macros/rtems/posix/key.inl macros/rtems/posix/mqueue.inl \
    45     macros/rtems/posix/mutex.inl macros/rtems/posix/pthread.inl \
    46     macros/rtems/posix/priority.inl macros/rtems/posix/semaphore.inl \
    47     macros/rtems/posix/timer.inl
    48 endif
    4941
    5042## src
  • cpukit/posix/preinstall.am

    re307735 r04dba49  
    122122PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphoremp.h
    123123endif
    124 if INLINE
    125124$(PROJECT_INCLUDE)/rtems/posix/cond.inl: inline/rtems/posix/cond.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    126125        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cond.inl
     
    154153        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl
    155154PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
    156 
    157 else
    158 $(PROJECT_INCLUDE)/rtems/posix/cond.inl: macros/rtems/posix/cond.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    159         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cond.inl
    160 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/cond.inl
    161 
    162 $(PROJECT_INCLUDE)/rtems/posix/key.inl: macros/rtems/posix/key.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    163         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.inl
    164 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.inl
    165 
    166 $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl: macros/rtems/posix/mqueue.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    167         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl
    168 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl
    169 
    170 $(PROJECT_INCLUDE)/rtems/posix/mutex.inl: macros/rtems/posix/mutex.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    171         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mutex.inl
    172 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mutex.inl
    173 
    174 $(PROJECT_INCLUDE)/rtems/posix/pthread.inl: macros/rtems/posix/pthread.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    175         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
    176 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
    177 
    178 $(PROJECT_INCLUDE)/rtems/posix/priority.inl: macros/rtems/posix/priority.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    179         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priority.inl
    180 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priority.inl
    181 
    182 $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl: macros/rtems/posix/semaphore.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    183         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl
    184 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl
    185 
    186 $(PROJECT_INCLUDE)/rtems/posix/timer.inl: macros/rtems/posix/timer.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    187         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl
    188 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
    189155endif
    190 endif
  • cpukit/rtems/Makefile.am

    re307735 r04dba49  
    4141endif
    4242
    43 if INLINE
    4443include_rtems_rtems_HEADERS += inline/rtems/rtems/asr.inl \
    4544    inline/rtems/rtems/attr.inl inline/rtems/rtems/barrier.inl \
     
    5251    inline/rtems/rtems/support.inl inline/rtems/rtems/tasks.inl \
    5352    inline/rtems/rtems/timer.inl
    54 else
    55 include_rtems_rtems_HEADERS += macros/rtems/rtems/asr.inl \
    56     macros/rtems/rtems/attr.inl macros/rtems/rtems/barrier.inl \
    57     macros/rtems/rtems/dpmem.inl \
    58     macros/rtems/rtems/event.inl macros/rtems/rtems/eventset.inl \
    59     macros/rtems/rtems/message.inl macros/rtems/rtems/modes.inl \
    60     macros/rtems/rtems/options.inl macros/rtems/rtems/part.inl \
    61     macros/rtems/rtems/ratemon.inl macros/rtems/rtems/region.inl \
    62     macros/rtems/rtems/sem.inl macros/rtems/rtems/status.inl \
    63     macros/rtems/rtems/support.inl macros/rtems/rtems/tasks.inl \
    64     macros/rtems/rtems/timer.inl
    65 endif
    6653
    6754## src
  • cpukit/rtems/preinstall.am

    re307735 r04dba49  
    157157PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
    158158endif
    159 if INLINE
    160159$(PROJECT_INCLUDE)/rtems/rtems/asr.inl: inline/rtems/rtems/asr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    161160        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
     
    226225PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
    227226
    228 else
    229 $(PROJECT_INCLUDE)/rtems/rtems/asr.inl: macros/rtems/rtems/asr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    230         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
    231 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
    232 
    233 $(PROJECT_INCLUDE)/rtems/rtems/attr.inl: macros/rtems/rtems/attr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    234         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
    235 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
    236 
    237 $(PROJECT_INCLUDE)/rtems/rtems/barrier.inl: macros/rtems/rtems/barrier.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    238         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/barrier.inl
    239 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/barrier.inl
    240 
    241 $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: macros/rtems/rtems/dpmem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    242         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
    243 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
    244 
    245 $(PROJECT_INCLUDE)/rtems/rtems/event.inl: macros/rtems/rtems/event.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    246         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/event.inl
    247 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/event.inl
    248 
    249 $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl: macros/rtems/rtems/eventset.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    250         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl
    251 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl
    252 
    253 $(PROJECT_INCLUDE)/rtems/rtems/message.inl: macros/rtems/rtems/message.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    254         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/message.inl
    255 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/message.inl
    256 
    257 $(PROJECT_INCLUDE)/rtems/rtems/modes.inl: macros/rtems/rtems/modes.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    258         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
    259 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
    260 
    261 $(PROJECT_INCLUDE)/rtems/rtems/options.inl: macros/rtems/rtems/options.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    262         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.inl
    263 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.inl
    264 
    265 $(PROJECT_INCLUDE)/rtems/rtems/part.inl: macros/rtems/rtems/part.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    266         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.inl
    267 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.inl
    268 
    269 $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl: macros/rtems/rtems/ratemon.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    270         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl
    271 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl
    272 
    273 $(PROJECT_INCLUDE)/rtems/rtems/region.inl: macros/rtems/rtems/region.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    274         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.inl
    275 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.inl
    276 
    277 $(PROJECT_INCLUDE)/rtems/rtems/sem.inl: macros/rtems/rtems/sem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    278         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/sem.inl
    279 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/sem.inl
    280 
    281 $(PROJECT_INCLUDE)/rtems/rtems/status.inl: macros/rtems/rtems/status.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    282         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/status.inl
    283 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/status.inl
    284 
    285 $(PROJECT_INCLUDE)/rtems/rtems/support.inl: macros/rtems/rtems/support.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    286         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/support.inl
    287 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/support.inl
    288 
    289 $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl: macros/rtems/rtems/tasks.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    290         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
    291 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
    292 
    293 $(PROJECT_INCLUDE)/rtems/rtems/timer.inl: macros/rtems/rtems/timer.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    294         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
    295 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
    296 endif
  • cpukit/sapi/Makefile.am

    re307735 r04dba49  
    1515EXTRA_DIST = include/rtems/README
    1616
    17 if INLINE
    1817include_rtems_HEADERS += inline/rtems/extension.inl
    19 else
    20 include_rtems_HEADERS += macros/rtems/extension.inl
    21 endif
    2218
    2319## src
  • cpukit/sapi/preinstall.am

    re307735 r04dba49  
    5151PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h
    5252
    53 if INLINE
    5453$(PROJECT_INCLUDE)/rtems/extension.inl: inline/rtems/extension.inl $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    5554        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
    5655PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
    5756
    58 else
    59 $(PROJECT_INCLUDE)/rtems/extension.inl: macros/rtems/extension.inl $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    60         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
    61 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
    62 endif
  • cpukit/score/Makefile.am

    re307735 r04dba49  
    4141
    4242## inline
    43 if INLINE
    4443include_rtems_score_HEADERS += inline/rtems/score/address.inl \
    4544    inline/rtems/score/chain.inl inline/rtems/score/corebarrier.inl \
     
    5958include_rtems_score_HEADERS += inline/rtems/score/mppkt.inl \
    6059    inline/rtems/score/objectmp.inl inline/rtems/score/threadmp.inl
    61 endif
    62 else
    63 ## macros
    64 include_rtems_score_HEADERS += macros/rtems/score/address.inl \
    65     macros/rtems/score/chain.inl macros/rtems/score/corebarrier.inl \
    66     macros/rtems/score/coremsg.inl \
    67     macros/rtems/score/corerwlock.inl \
    68     macros/rtems/score/corespinlock.inl \
    69     macros/rtems/score/coremutex.inl macros/rtems/score/coresem.inl \
    70     macros/rtems/score/heap.inl macros/rtems/score/isr.inl \
    71     macros/rtems/score/object.inl macros/rtems/score/priority.inl \
    72     macros/rtems/score/stack.inl macros/rtems/score/states.inl \
    73     macros/rtems/score/sysstate.inl macros/rtems/score/thread.inl \
    74     macros/rtems/score/tod.inl macros/rtems/score/tqdata.inl \
    75     macros/rtems/score/userext.inl macros/rtems/score/watchdog.inl \
    76     macros/rtems/score/wkspace.inl
    77 if HAS_MP
    78 ## We only build multiprocessing related files if HAS_MP was defined
    79 include_rtems_score_HEADERS += macros/rtems/score/mppkt.inl \
    80     macros/rtems/score/objectmp.inl macros/rtems/score/threadmp.inl
    81 endif
    8260endif
    8361
  • cpukit/score/include/rtems/score/chain.h

    re307735 r04dba49  
    114114);
    115115
    116 #ifndef RTEMS_INLINES
    117 /**
    118  *  @brief Get the first node (do not disable interrupts)
    119  *
    120  *  This method attempts to obtain the first node from @a the_chain.
    121  *
    122  *  @param[in] the_chain points to the chain to operate upon
    123  *  @return If successful, a chain node is returned.  Otherwise, NULL
    124  *  is returned.
    125  */
    126 Chain_Node *_Chain_Get_first_unprotected(
    127   Chain_Control *the_chain
    128 );
    129 #endif
    130 
    131116/**
    132117 *  @brief Extract the specified node from a chain
  • cpukit/score/include/rtems/score/thread.h

    re307735 r04dba49  
    703703boolean _Thread_Evaluate_mode( void );
    704704
    705 #ifndef RTEMS_INLINES
    706 /**
    707  *  @note  If we are not using static inlines, this must be a real
    708  *         subroutine call.
    709  */
    710 Thread_Control *_Thread_Get (
    711   Objects_Id           id,
    712   Objects_Locations   *location
    713 );
    714 #endif
    715 
    716705#if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE)
    717706/**
  • cpukit/score/include/rtems/system.h

    re307735 r04dba49  
    126126 *  type checking with no cost in code size or execution speed.
    127127 */
    128 #ifdef RTEMS_INLINES
    129 # ifdef __GNUC__
     128#ifdef __GNUC__
    130129#  define RTEMS_INLINE_ROUTINE static __inline__
    131 # else
     130#else
    132131#  define RTEMS_INLINE_ROUTINE static inline
    133 # endif
    134 #else
    135 # define RTEMS_INLINE_ROUTINE
    136132#endif
    137133
  • cpukit/score/preinstall.am

    re307735 r04dba49  
    169169PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.h
    170170endif
    171 if INLINE
     171
    172172$(PROJECT_INCLUDE)/rtems/score/address.inl: inline/rtems/score/address.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    173173        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/address.inl
     
    267267PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
    268268endif
    269 else
    270 $(PROJECT_INCLUDE)/rtems/score/address.inl: macros/rtems/score/address.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    271         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/address.inl
    272 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/address.inl
    273 
    274 $(PROJECT_INCLUDE)/rtems/score/chain.inl: macros/rtems/score/chain.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    275         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chain.inl
    276 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chain.inl
    277 
    278 $(PROJECT_INCLUDE)/rtems/score/corebarrier.inl: macros/rtems/score/corebarrier.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    279         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corebarrier.inl
    280 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corebarrier.inl
    281 
    282 $(PROJECT_INCLUDE)/rtems/score/coremsg.inl: macros/rtems/score/coremsg.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    283         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremsg.inl
    284 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremsg.inl
    285 
    286 $(PROJECT_INCLUDE)/rtems/score/corerwlock.inl: macros/rtems/score/corerwlock.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    287         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corerwlock.inl
    288 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corerwlock.inl
    289 
    290 $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl: macros/rtems/score/corespinlock.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    291         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl
    292 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl
    293 
    294 $(PROJECT_INCLUDE)/rtems/score/coremutex.inl: macros/rtems/score/coremutex.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    295         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremutex.inl
    296 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremutex.inl
    297 
    298 $(PROJECT_INCLUDE)/rtems/score/coresem.inl: macros/rtems/score/coresem.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    299         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coresem.inl
    300 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coresem.inl
    301 
    302 $(PROJECT_INCLUDE)/rtems/score/heap.inl: macros/rtems/score/heap.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    303         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/heap.inl
    304 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/heap.inl
    305 
    306 $(PROJECT_INCLUDE)/rtems/score/isr.inl: macros/rtems/score/isr.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    307         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isr.inl
    308 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isr.inl
    309 
    310 $(PROJECT_INCLUDE)/rtems/score/object.inl: macros/rtems/score/object.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    311         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.inl
    312 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.inl
    313 
    314 $(PROJECT_INCLUDE)/rtems/score/priority.inl: macros/rtems/score/priority.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    315         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priority.inl
    316 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priority.inl
    317 
    318 $(PROJECT_INCLUDE)/rtems/score/stack.inl: macros/rtems/score/stack.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    319         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.inl
    320 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.inl
    321 
    322 $(PROJECT_INCLUDE)/rtems/score/states.inl: macros/rtems/score/states.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    323         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl
    324 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl
    325 
    326 $(PROJECT_INCLUDE)/rtems/score/sysstate.inl: macros/rtems/score/sysstate.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    327         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sysstate.inl
    328 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sysstate.inl
    329 
    330 $(PROJECT_INCLUDE)/rtems/score/thread.inl: macros/rtems/score/thread.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    331         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/thread.inl
    332 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/thread.inl
    333 
    334 $(PROJECT_INCLUDE)/rtems/score/tod.inl: macros/rtems/score/tod.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    335         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/tod.inl
    336 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/tod.inl
    337 
    338 $(PROJECT_INCLUDE)/rtems/score/tqdata.inl: macros/rtems/score/tqdata.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    339         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/tqdata.inl
    340 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/tqdata.inl
    341 
    342 $(PROJECT_INCLUDE)/rtems/score/userext.inl: macros/rtems/score/userext.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    343         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/userext.inl
    344 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/userext.inl
    345 
    346 $(PROJECT_INCLUDE)/rtems/score/watchdog.inl: macros/rtems/score/watchdog.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    347         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/watchdog.inl
    348 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/watchdog.inl
    349 
    350 $(PROJECT_INCLUDE)/rtems/score/wkspace.inl: macros/rtems/score/wkspace.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    351         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/wkspace.inl
    352 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/wkspace.inl
    353 
    354 if HAS_MP
    355 $(PROJECT_INCLUDE)/rtems/score/mppkt.inl: macros/rtems/score/mppkt.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    356         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mppkt.inl
    357 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mppkt.inl
    358 
    359 $(PROJECT_INCLUDE)/rtems/score/objectmp.inl: macros/rtems/score/objectmp.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    360         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/objectmp.inl
    361 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/objectmp.inl
    362 
    363 $(PROJECT_INCLUDE)/rtems/score/threadmp.inl: macros/rtems/score/threadmp.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    364         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
    365 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
    366 endif
    367 endif
  • cpukit/score/src/chain.c

    re307735 r04dba49  
    6666  the_chain->last  = current;
    6767}
    68 
    69 /*PAGE
    70  *
    71  *  _Chain_Get_first_unprotected
    72  */
    73 
    74 #ifndef RTEMS_INLINES
    75 Chain_Node *_Chain_Get_first_unprotected(
    76   Chain_Control *the_chain
    77 )
    78 {
    79   Chain_Node  *return_node;
    80   Chain_Node  *new_first;
    81 
    82   return_node         = the_chain->first;
    83   new_first           = return_node->next;
    84   the_chain->first    = new_first;
    85   new_first->previous = _Chain_Head( the_chain );
    86 
    87   return return_node;
    88 }
    89 #endif   /* RTEMS_INLINES */
    9068
    9169/*PAGE
  • cpukit/score/src/coremutexseize.c

    re307735 r04dba49  
    6464}
    6565
    66 #if !defined(RTEMS_INLINES)
    67 int _CORE_mutex_Seize_interrupt_trylock(
    68   CORE_mutex_Control  *the_mutex,
    69   ISR_Level           *level_p
    70 )
    71 {
    72   Thread_Control   *executing;
    73   ISR_Level         level = *level_p;
    74 
    75   /* disabled when you get here */
    76 
    77   executing = _Thread_Executing;
    78   executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
    79   if ( !_CORE_mutex_Is_locked( the_mutex ) ) {
    80     the_mutex->lock       = CORE_MUTEX_LOCKED;
    81     the_mutex->holder     = executing;
    82     the_mutex->holder_id  = executing->Object.id;
    83     the_mutex->nest_count = 1;
    84     if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) ||
    85          _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) )
    86       executing->resource_count++;
    87 
    88     if ( !_CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) {
    89       _ISR_Enable( level );
    90       return 0;
    91     }
    92     /* else must be CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING */
    93     {
    94        Priority_Control  ceiling;
    95        Priority_Control  current;
    96 
    97        ceiling = the_mutex->Attributes.priority_ceiling;
    98        current = executing->current_priority;
    99        if ( current == ceiling ) {
    100          _ISR_Enable( level );
    101          return 0;
    102        }
    103        if ( current > ceiling ) {
    104         _Thread_Disable_dispatch();
    105         _ISR_Enable( level );
    106         _Thread_Change_priority(
    107           the_mutex->holder,
    108           the_mutex->Attributes.priority_ceiling,
    109           FALSE
    110         );
    111         _Thread_Enable_dispatch();
    112         return 0;
    113       }
    114       /* if ( current < ceiling ) */ {
    115         executing->Wait.return_code = CORE_MUTEX_STATUS_CEILING_VIOLATED;
    116         the_mutex->nest_count = 0;     /* undo locking above */
    117         executing->resource_count--;   /* undo locking above */
    118         _ISR_Enable( level );
    119         return 0;
    120       }
    121     }
    122     return 0;
    123   }
    124 
    125   if ( _Thread_Is_executing( the_mutex->holder ) ) {
    126     switch ( the_mutex->Attributes.lock_nesting_behavior ) {
    127       case CORE_MUTEX_NESTING_ACQUIRES:
    128         the_mutex->nest_count++;
    129         _ISR_Enable( level );
    130         return 0;
    131       case CORE_MUTEX_NESTING_IS_ERROR:
    132         executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
    133         _ISR_Enable( level );
    134         return 0;
    135       case CORE_MUTEX_NESTING_BLOCKS:
    136         break;
    137     }
    138   }
    139 
    140   return 1;
    141 }
    142 #endif
  • cpukit/score/src/threadget.c

    re307735 r04dba49  
    3131#include <rtems/score/wkspace.h>
    3232
    33 /*PAGE
    34  *
    35  *  _Thread_Get
    36  *
    37  *  NOTE:  If we are not using static inlines, this must be a real
    38  *         subroutine call.
    39  *
    40  *  NOTE:  XXX... This routine may be able to be optimized.
    41  */
    42 
    43 #ifndef RTEMS_INLINES
    44 
    45 Thread_Control *_Thread_Get (
    46   Objects_Id           id,
    47   Objects_Locations   *location
    48 )
    49 {
    50   uint32_t             the_api;
    51   uint32_t             the_class;
    52   Objects_Information *information;
    53   Thread_Control      *tp = (Thread_Control *) 0;
    54 
    55   if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
    56     _Thread_Disable_dispatch();
    57     *location = OBJECTS_LOCAL;
    58     tp = _Thread_Executing;
    59     goto done;
    60   }
    61 
    62   the_api = _Objects_Get_API( id );
    63   if ( the_api && the_api > OBJECTS_APIS_LAST ) {
    64     *location = OBJECTS_ERROR;
    65     goto done;
    66   }
    67 
    68   the_class = _Objects_Get_class( id );
    69   if ( the_class != 1 ) {       /* threads are always first class :) */
    70     *location = OBJECTS_ERROR;
    71     goto done;
    72   }
    73 
    74   information = _Objects_Information_table[ the_api ][ the_class ];
    75 
    76   if ( !information ) {
    77     *location = OBJECTS_ERROR;
    78     goto done;
    79   }
    80 
    81   tp = (Thread_Control *) _Objects_Get( information, id, location );
    82 
    83 done:
    84   return tp;
    85 }
    86 
    87 #endif
     33#warning "unneeded when macros gone"
Note: See TracChangeset for help on using the changeset viewer.