Changeset cfa5aab in rtems


Ignore:
Timestamp:
May 2, 2015, 12:02:20 PM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
b76dd97
Parents:
e76c517
git-author:
Sebastian Huber <sebastian.huber@…> (05/02/15 12:02:20)
git-committer:
Sebastian Huber <sebastian.huber@…> (05/19/15 10:00:46)
Message:

score: Delete _CORE_semaphore_Seize()

Rename _CORE_semaphore_Seize_isr_disable() to _CORE_semaphore_Seize().

Location:
cpukit
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • cpukit/posix/src/semaphorewaitsupp.c

    re76c517 rcfa5aab  
    4141  Objects_Locations        location;
    4242  Thread_Control          *executing;
     43  ISR_lock_Context         lock_context;
    4344
    44   the_semaphore = _POSIX_Semaphore_Get( sem, &location );
     45  the_semaphore = _POSIX_Semaphore_Get_interrupt_disable(
     46    sem,
     47    &location,
     48    &lock_context
     49  );
    4550  switch ( location ) {
    4651
     
    5257        the_semaphore->Object.id,
    5358        blocking,
    54         timeout
     59        timeout,
     60        &lock_context
    5561      );
    56       _Objects_Put( &the_semaphore->Object );
    5762
    5863      if ( !executing->Wait.return_code )
  • cpukit/rtems/src/semobtain.c

    re76c517 rcfa5aab  
    9494
    9595      /* must be a counting semaphore */
    96       _CORE_semaphore_Seize_isr_disable(
     96      _CORE_semaphore_Seize(
    9797        &the_semaphore->Core_control.semaphore,
    9898        executing,
  • cpukit/score/Makefile.am

    re76c517 rcfa5aab  
    178178
    179179## CORE_SEMAPHORE_C_FILES
    180 libscore_a_SOURCES += src/coresem.c src/coresemflush.c src/coresemseize.c \
     180libscore_a_SOURCES += src/coresem.c src/coresemflush.c \
    181181    src/coresemsurrender.c
    182182
  • cpukit/score/include/rtems/score/coresemimpl.h

    re76c517 rcfa5aab  
    3333 */
    3434/**@{**/
    35 
    36 #if defined(RTEMS_POSIX_API) || defined(RTEMS_MULTIPROCESSING)
    37   #define RTEMS_SCORE_CORESEM_ENABLE_SEIZE_BODY
    38 #endif
    3935
    4036/**
     
    105101  _Thread_queue_Destroy( &the_semaphore->Wait_queue );
    106102}
    107 
    108 #if defined(RTEMS_SCORE_CORESEM_ENABLE_SEIZE_BODY)
    109   /**
    110    *  This routine attempts to receive a unit from @a the_semaphore.
    111    *  If a unit is available or if the wait flag is false, then the routine
    112    *  returns.  Otherwise, the calling task is blocked until a unit becomes
    113    *  available.
    114    *
    115    *  @param[in] the_semaphore is the semaphore to seize
    116    *  @param[in,out] executing The currently executing thread.
    117    *  @param[in] id is the Id of the API level Semaphore object associated
    118    *         with this instance of a SuperCore Semaphore
    119    *  @param[in] wait indicates if the caller is willing to block
    120    *  @param[in] timeout is the number of ticks the calling thread is willing
    121    *         to wait if @a wait is true.
    122    */
    123   void _CORE_semaphore_Seize(
    124     CORE_semaphore_Control  *the_semaphore,
    125     Thread_Control          *executing,
    126     Objects_Id               id,
    127     bool                     wait,
    128     Watchdog_Interval        timeout
    129   );
    130 #endif
    131103
    132104/**
     
    220192 * @note There is currently no MACRO version of this routine.
    221193 */
    222 RTEMS_INLINE_ROUTINE void _CORE_semaphore_Seize_isr_disable(
     194RTEMS_INLINE_ROUTINE void _CORE_semaphore_Seize(
    223195  CORE_semaphore_Control  *the_semaphore,
    224196  Thread_Control          *executing,
  • cpukit/score/src/mpci.c

    re76c517 rcfa5aab  
    284284  MPCI_Packet_processor     the_function;
    285285  Thread_Control           *executing;
     286  ISR_lock_Context          lock_context;
    286287
    287288  executing = _Thread_Get_executing();
     
    291292    executing->receive_packet = NULL;
    292293
    293     _Thread_Disable_dispatch();
     294    _ISR_lock_ISR_disable( &lock_context );
    294295    _CORE_semaphore_Seize(
    295296      &_MPCI_Semaphore,
     
    297298      0,
    298299      true,
    299       WATCHDOG_NO_TIMEOUT
     300      WATCHDOG_NO_TIMEOUT,
     301      &lock_context
    300302    );
    301     _Thread_Enable_dispatch();
    302303
    303304    for ( ; ; ) {
Note: See TracChangeset for help on using the changeset viewer.