diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-03 20:58:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-03 20:58:29 +0000 |
commit | 109ace3a1f0f6f26d974a1ed8e9595aa0eef0885 (patch) | |
tree | 39f88b77b8ac4bd91bfb3ac685be86e14ad9b1fb /cpukit/rtems/src/timerreset.c | |
parent | 2008-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-109ace3a1f0f6f26d974a1ed8e9595aa0eef0885.tar.bz2 |
2008-12-03 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1347/cpukit
* rtems/include/rtems/rtems/timer.h, rtems/src/rtemstimer.c,
rtems/src/timerreset.c, rtems/src/timerserver.c,
rtems/src/timerserverfireafter.c, rtems/src/timerserverfirewhen.c,
score/Makefile.am, score/include/rtems/score/watchdog.h: Rework Timer
Server to ensure that the context allows for blocking, allocating
memory, and acquiring semaphores and mutexes.
* score/src/watchdogadjusttochain.c: New file.
Diffstat (limited to '')
-rw-r--r-- | cpukit/rtems/src/timerreset.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c index 7fea9fa7d5..1688051f8a 100644 --- a/cpukit/rtems/src/timerreset.c +++ b/cpukit/rtems/src/timerreset.c @@ -56,11 +56,12 @@ rtems_status_code rtems_timer_reset( _Watchdog_Insert( &_Watchdog_Ticks_chain, &the_timer->Ticker ); break; case TIMER_INTERVAL_ON_TASK: - _Timer_Server_stop_ticks_timer(); + if ( !_Timer_Server_schedule_operation ) { + _Thread_Enable_dispatch(); + return RTEMS_INCORRECT_STATE; + } _Watchdog_Remove( &the_timer->Ticker ); - _Timer_Server_process_ticks_chain(); - _Watchdog_Insert( &_Timer_Ticks_chain, &the_timer->Ticker ); - _Timer_Server_reset_ticks_timer(); + (*_Timer_Server_schedule_operation)( the_timer ); break; case TIMER_TIME_OF_DAY: case TIMER_TIME_OF_DAY_ON_TASK: |