Changeset 00c620c in rtems


Ignore:
Timestamp:
Jul 26, 2016, 5:53:34 AM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
75fc27ad
Parents:
f78a5f5
Message:

score: Format

Location:
cpukit/score/include/rtems/score
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/include/rtems/score/threadimpl.h

    rf78a5f5 r00c620c  
    15121512  _ISR_lock_ISR_disable_and_acquire( &the_thread->Timer.Lock, &lock_context );
    15131513
    1514   the_thread->Timer.header = &cpu->Watchdog.Header[PER_CPU_WATCHDOG_RELATIVE];
     1514  the_thread->Timer.header =
     1515    &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ];
    15151516  the_thread->Timer.Watchdog.routine = routine;
    15161517  _Watchdog_Per_CPU_insert_relative( &the_thread->Timer.Watchdog, cpu, ticks );
     
    15231524  Per_CPU_Control                *cpu,
    15241525  Watchdog_Service_routine_entry  routine,
    1525   uint64_t                        ticks
     1526  uint64_t                        expire
    15261527)
    15271528{
     
    15301531  _ISR_lock_ISR_disable_and_acquire( &the_thread->Timer.Lock, &lock_context );
    15311532
    1532   the_thread->Timer.header = &cpu->Watchdog.Header[PER_CPU_WATCHDOG_ABSOLUTE];
     1533  the_thread->Timer.header =
     1534    &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ];
    15331535  the_thread->Timer.Watchdog.routine = routine;
    1534   _Watchdog_Per_CPU_insert_absolute( &the_thread->Timer.Watchdog, cpu, ticks );
     1536  _Watchdog_Per_CPU_insert_absolute( &the_thread->Timer.Watchdog, cpu, expire );
    15351537
    15361538  _ISR_lock_Release_and_ISR_enable( &the_thread->Timer.Lock, &lock_context );
    15371539}
    1538 
    1539 
    1540 
    15411540
    15421541RTEMS_INLINE_ROUTINE void _Thread_Timer_remove( Thread_Control *the_thread )
  • cpukit/score/include/rtems/score/watchdogimpl.h

    rf78a5f5 r00c620c  
    341341
    342342RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_relative(
    343   Watchdog_Control    *the_watchdog,
    344   Per_CPU_Control     *cpu,
    345   Watchdog_Interval    ticks
    346 )
    347 {
    348   ISR_lock_Context lock_context;
    349   Watchdog_Header *header;
    350   uint64_t expire;
     343  Watchdog_Control  *the_watchdog,
     344  Per_CPU_Control   *cpu,
     345  Watchdog_Interval  ticks
     346)
     347{
     348  ISR_lock_Context  lock_context;
     349  Watchdog_Header  *header;
     350  uint64_t          expire;
     351
     352  header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ];
    351353
    352354  _Watchdog_Set_CPU( the_watchdog, cpu );
    353355
    354356  _Watchdog_Per_CPU_acquire_critical( cpu, &lock_context );
    355 
    356357  expire = ticks + cpu->Watchdog.ticks;
    357   header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ];
    358 
    359358  _Watchdog_Insert(header, the_watchdog, expire);
    360359  _Watchdog_Per_CPU_release_critical( cpu, &lock_context );
     
    363362
    364363RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_absolute(
    365   Watchdog_Control    *the_watchdog,
    366   Per_CPU_Control     *cpu,
    367   uint64_t             expire
    368 )
    369 {
    370   ISR_lock_Context lock_context;
    371   Watchdog_Header *header;
     364  Watchdog_Control *the_watchdog,
     365  Per_CPU_Control  *cpu,
     366  uint64_t          expire
     367)
     368{
     369  ISR_lock_Context  lock_context;
     370  Watchdog_Header  *header;
     371
     372  header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ];
    372373
    373374  _Watchdog_Set_CPU( the_watchdog, cpu );
    374375
    375376  _Watchdog_Per_CPU_acquire_critical( cpu, &lock_context );
    376 
    377   header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ];
    378 
    379377  _Watchdog_Insert(header, the_watchdog, expire);
    380378  _Watchdog_Per_CPU_release_critical( cpu, &lock_context );
Note: See TracChangeset for help on using the changeset viewer.