From 109ace3a1f0f6f26d974a1ed8e9595aa0eef0885 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Dec 2008 20:58:29 +0000 Subject: 2008-12-03 Joel Sherrill 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. --- cpukit/rtems/src/timerserverfireafter.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cpukit/rtems/src/timerserverfireafter.c') diff --git a/cpukit/rtems/src/timerserverfireafter.c b/cpukit/rtems/src/timerserverfireafter.c index 568f53be1e..d23edee60c 100644 --- a/cpukit/rtems/src/timerserverfireafter.c +++ b/cpukit/rtems/src/timerserverfireafter.c @@ -92,10 +92,12 @@ rtems_status_code rtems_timer_server_fire_after( the_timer->Ticker.initial = ticks; _ISR_Enable( level ); - _Timer_Server_stop_ticks_timer(); - _Timer_Server_process_ticks_chain(); - _Watchdog_Insert( &_Timer_Ticks_chain, &the_timer->Ticker ); - _Timer_Server_reset_ticks_timer(); + /* + * _Timer_Server_schedule_operation != NULL because we checked that + * _Timer_Server was != NULL above. Both are set at the same time. + */ + + (*_Timer_Server_schedule_operation)( the_timer ); _Thread_Enable_dispatch(); return RTEMS_SUCCESSFUL; -- cgit v1.2.3