From 88d594a3d52cb5938521619bca0def8e5b040cf0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 24 May 1995 21:39:42 +0000 Subject: Fully tested on all in-house targets --- c/src/exec/rtems/src/rtemstimer.c | 7 ++----- c/src/exec/rtems/src/timer.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'c/src/exec/rtems') diff --git a/c/src/exec/rtems/src/rtemstimer.c b/c/src/exec/rtems/src/rtemstimer.c index 076091bee4..abab4cc7b4 100644 --- a/c/src/exec/rtems/src/rtemstimer.c +++ b/c/src/exec/rtems/src/rtemstimer.c @@ -146,13 +146,10 @@ rtems_status_code rtems_timer_cancel( case OBJECTS_REMOTE: /* should never return this */ return( RTEMS_INTERNAL_ERROR ); case OBJECTS_LOCAL: - if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) { + if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) (void) _Watchdog_Remove( &the_timer->Ticker ); - _Thread_Enable_dispatch(); - return( RTEMS_SUCCESSFUL ); - } _Thread_Enable_dispatch(); - return( RTEMS_INCORRECT_STATE ); + return( RTEMS_SUCCESSFUL ); } return( RTEMS_INTERNAL_ERROR ); /* unreached - only to remove warnings */ diff --git a/c/src/exec/rtems/src/timer.c b/c/src/exec/rtems/src/timer.c index 076091bee4..abab4cc7b4 100644 --- a/c/src/exec/rtems/src/timer.c +++ b/c/src/exec/rtems/src/timer.c @@ -146,13 +146,10 @@ rtems_status_code rtems_timer_cancel( case OBJECTS_REMOTE: /* should never return this */ return( RTEMS_INTERNAL_ERROR ); case OBJECTS_LOCAL: - if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) { + if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) (void) _Watchdog_Remove( &the_timer->Ticker ); - _Thread_Enable_dispatch(); - return( RTEMS_SUCCESSFUL ); - } _Thread_Enable_dispatch(); - return( RTEMS_INCORRECT_STATE ); + return( RTEMS_SUCCESSFUL ); } return( RTEMS_INTERNAL_ERROR ); /* unreached - only to remove warnings */ -- cgit v1.2.3