From 1041de1ab071d126148f0c02e5da0db637001f1c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 20 Apr 2015 09:45:10 +0200 Subject: score: Add _Thread_Get_interrupt_disable() Remove _Thread_Acquire() and _Thread_Acquire_for_executing(). Add utility functions for the default thread lock. Use the default thread lock for the RTEMS events. There is no need to disable thread dispatching and a Giant acquire in _Event_Timeout() since this was already done by the caller. Update #2273. --- cpukit/rtems/src/eventsurrender.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpukit/rtems/src/eventsurrender.c') diff --git a/cpukit/rtems/src/eventsurrender.c b/cpukit/rtems/src/eventsurrender.c index 824912b38d..ba4e429f1e 100644 --- a/cpukit/rtems/src/eventsurrender.c +++ b/cpukit/rtems/src/eventsurrender.c @@ -64,6 +64,8 @@ void _Event_Surrender( Thread_Wait_flags wait_flags; bool unblock; + _Thread_Lock_acquire_default_critical( the_thread, lock_context ); + _Event_sets_Post( event_in, &event->pending_events ); pending_events = event->pending_events; @@ -105,10 +107,8 @@ void _Event_Surrender( if ( unblock ) { Per_CPU_Control *cpu_self; - cpu_self = _Objects_Release_and_thread_dispatch_disable( - &the_thread->Object, - lock_context - ); + cpu_self = _Thread_Dispatch_disable_critical(); + _Thread_Lock_release_default( the_thread, lock_context ); _Giant_Acquire( cpu_self ); _Watchdog_Remove( &the_thread->Timer ); @@ -117,6 +117,6 @@ void _Event_Surrender( _Giant_Release( cpu_self ); _Thread_Dispatch_enable( cpu_self ); } else { - _Objects_Release_and_ISR_enable( &the_thread->Object, lock_context ); + _Thread_Lock_release_default( the_thread, lock_context ); } } -- cgit v1.2.3