diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-16 22:09:50 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-16 22:09:50 +0000 |
| commit | c55df856aaba12355354374983fc1e69bb60373d (patch) | |
| tree | 69d27f1748f29490a291d934a76b4e4afb9baadd /cpukit/rtems/src/timerreset.c | |
| parent | 2001-01-16 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-c55df856aaba12355354374983fc1e69bb60373d.tar.bz2 | |
2001-01-16 Joel Sherrill <joel@OARcorp.com>
* Added task-based timers to the Timer Manager. This added three
new directives:
- rtems_timer_initiate_server
- rtems_timer_server_fire_after
- rtems_timer_server_fire_when
In the process of doing this, a number of cleanups were made.
* src/timerserver.c, src/timerserverfireafter.c,
src/timerserverfirewhen.c: New files.
* include/timer/timer.h: Added new prototypes and supporting types.
* inline/rtems/rtems/timer.h, macros/rtems/rtems/timer.h: Enhanced
_Timer_Is_interval_class() to cover the class TIMER_INTERVAL_ON_TASK.
* src/Makefile.am: Accounted for new files.
* src/rtemstimer.c: Added initialization of _Timer_Server variable.
* src/timercancel.c, src/timerreset.c: Account for addition
of timer classes. Also corrected the headers.
* src/timercreate.c, src/timerdelete.c, src/timerfireafter.c,
src/timerfireafter.c, src/timerident.c: Corrected header.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/rtems/src/timerreset.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c index f538098b1e..33a45e1fc3 100644 --- a/cpukit/rtems/src/timerreset.c +++ b/cpukit/rtems/src/timerreset.c @@ -1,8 +1,8 @@ /* - * Timer Manager + * Timer Manager - rtems_timer_reset directive * * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2002. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -32,7 +32,7 @@ * * Output parameters: * RTEMS_SUCCESSFUL - if successful - * error code - if unsuccessful + * error code - if unsuccessful */ rtems_status_code rtems_timer_reset( @@ -51,13 +51,23 @@ rtems_status_code rtems_timer_reset( return RTEMS_INVALID_ID; case OBJECTS_LOCAL: - if ( _Timer_Is_interval_class( the_timer->the_class ) ) { - _Watchdog_Reset( &the_timer->Ticker ); - _Thread_Enable_dispatch(); - return RTEMS_SUCCESSFUL; + switch ( the_timer->the_class ) { + case TIMER_INTERVAL: + _Watchdog_Remove( &the_timer->Ticker ); + _Watchdog_Insert( &_Watchdog_Ticks_chain, &the_timer->Ticker ); + break; + case TIMER_INTERVAL_ON_TASK: + _Watchdog_Remove( &the_timer->Ticker ); + _Watchdog_Insert( &_Timer_Ticks_chain, &the_timer->Ticker ); + break; + case TIMER_TIME_OF_DAY: + case TIMER_TIME_OF_DAY_ON_TASK: + case TIMER_DORMANT: + _Thread_Enable_dispatch(); + return RTEMS_NOT_DEFINED; } _Thread_Enable_dispatch(); - return RTEMS_NOT_DEFINED; + return RTEMS_SUCCESSFUL; } return RTEMS_INTERNAL_ERROR; /* unreached - only to remove warnings */ |