RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

rtems: Simplify rtems_semaphore_obtain()

Browse Source
This commit is contained in:
Sebastian Huber
2014-05-21 09:30:14 +02:00
parent 1bf0666448
commit a070c8bb81
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/rtems/src/semobtain.c
View File

@@ -41,18 +41,20 @@ rtems_status_code rtems_semaphore_obtain(
Objects_Locations location; Objects_Locations location;
ISR_Level level; ISR_Level level;
Thread_Control *executing; Thread_Control *executing;
bool wait;
the_semaphore = _Semaphore_Get_interrupt_disable( id, &location, &level ); the_semaphore = _Semaphore_Get_interrupt_disable( id, &location, &level );
switch ( location ) { switch ( location ) {
case OBJECTS_LOCAL: case OBJECTS_LOCAL:
executing = _Thread_Executing; executing = _Thread_Executing;
wait = !_Options_Is_no_wait( option_set );
if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) { if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) {
_CORE_mutex_Seize( _CORE_mutex_Seize(
&the_semaphore->Core_control.mutex, &the_semaphore->Core_control.mutex,
executing, executing,
id, id,
((_Options_Is_no_wait( option_set )) ? false : true), wait,
timeout, timeout,
level level
); );
@@ -66,7 +68,7 @@ rtems_status_code rtems_semaphore_obtain(
&the_semaphore->Core_control.semaphore, &the_semaphore->Core_control.semaphore,
executing, executing,
id, id,
((_Options_Is_no_wait( option_set )) ? false : true), wait,
timeout, timeout,
level level
); );