Changeset 86436f44 in rtems


Ignore:
Timestamp:
Nov 9, 2009, 2:52:28 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
fd3a990
Parents:
1369978
Message:

2009-11-09 Joel Sherrill <joel.sherrill@…>

  • score/inline/rtems/score/coremutex.inl, score/inline/rtems/score/coresem.inl: Eliminate use of local variable. This local variable causes unused variable warnings on some ports.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r1369978 r86436f44  
     12009-11-09      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * score/inline/rtems/score/coremutex.inl,
     4        score/inline/rtems/score/coresem.inl: Eliminate use of local
     5        variable. This local variable causes unused variable warnings
     6        on some ports.
     7
    182009-11-09      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • cpukit/score/inline/rtems/score/coremutex.inl

    r1369978 r86436f44  
    131131{
    132132  Thread_Control   *executing;
    133   ISR_Level         level = *level_p;
    134133
    135134  /* disabled when you get here */
     
    155154
    156155    if ( !_CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) {
    157         _ISR_Enable( level );
    158         return 0;
     156      _ISR_Enable( *level_p );
     157      return 0;
    159158    } /* else must be CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING
    160159       *
     
    169168      current = executing->current_priority;
    170169      if ( current == ceiling ) {
    171         _ISR_Enable( level );
     170        _ISR_Enable( *level_p );
    172171        return 0;
    173172      }
     
    175174      if ( current > ceiling ) {
    176175        _Thread_Disable_dispatch();
    177         _ISR_Enable( level );
     176        _ISR_Enable( *level_p );
    178177        _Thread_Change_priority(
    179178          the_mutex->holder,
     
    189188        the_mutex->nest_count = 0;     /* undo locking above */
    190189        executing->resource_count--;   /* undo locking above */
    191         _ISR_Enable( level );
     190        _ISR_Enable( *level_p );
    192191        return 0;
    193192      }
     
    205204      case CORE_MUTEX_NESTING_ACQUIRES:
    206205        the_mutex->nest_count++;
    207         _ISR_Enable( level );
     206        _ISR_Enable( *level_p );
    208207        return 0;
    209208      case CORE_MUTEX_NESTING_IS_ERROR:
    210209        executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
    211         _ISR_Enable( level );
     210        _ISR_Enable( *level_p );
    212211        return 0;
    213212      case CORE_MUTEX_NESTING_BLOCKS:
  • cpukit/score/inline/rtems/score/coresem.inl

    r1369978 r86436f44  
    7777  CORE_semaphore_Control  *the_semaphore,
    7878  Objects_Id               id,
    79   bool                  wait,
     79  bool                     wait,
    8080  Watchdog_Interval        timeout,
    8181  ISR_Level               *level_p
     
    8383{
    8484  Thread_Control *executing;
    85   ISR_Level       level = *level_p;
    8685
    8786  /* disabled when you get here */
     
    9190  if ( the_semaphore->count != 0 ) {
    9291    the_semaphore->count -= 1;
    93     _ISR_Enable( level );
     92    _ISR_Enable( *level_p );
    9493    return;
    9594  }
    9695
    9796  if ( !wait ) {
    98     _ISR_Enable( level );
     97    _ISR_Enable( *level_p );
    9998    executing->Wait.return_code = CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT;
    10099    return;
     
    105104  executing->Wait.queue          = &the_semaphore->Wait_queue;
    106105  executing->Wait.id             = id;
    107   _ISR_Enable( level );
     106  _ISR_Enable( *level_p );
    108107
    109108  _Thread_queue_Enqueue( &the_semaphore->Wait_queue, timeout );
Note: See TracChangeset for help on using the changeset viewer.