Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

+ Modified correct return path to call _ITRON_return_errorno( E_OK ) instead

Browse Source 
of enabling dispatching and returning E_OK.
+  Changed validation of the_thread to validation of location.
+  Set correct error code when dormant state.
+  Fixed comment.
This commit is contained in:
Joel Sherrill
1999-11-12 21:13:52 +00:00
parent ea6bfcbe1e
commit 2183b65b81
2 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
c/src/exec/itron/src/chg_pri.c
View File

@@ -30,39 +30,34 @@ ER chg_pri(
Priority_Control new_priority; Priority_Control new_priority;
the_thread = _ITRON_Task_Get( tskid, &location ); the_thread = _ITRON_Task_Get( tskid, &location );
if (!the_thread)
_ITRON_return_errorno( _ITRON_Task_Clarify_get_id_error( tskid ) );
if (_States_Is_dormant( the_thread->current_state ))
return -1;
if (( tskpri <= 0 ) || ( tskpri >= 256 ))
_ITRON_return_errorno( E_PAR );
switch ( location ) { switch ( location ) {
case OBJECTS_REMOTE: case OBJECTS_REMOTE:
case OBJECTS_ERROR: case OBJECTS_ERROR:
_ITRON_return_errorno( _ITRON_Task_Clarify_get_id_error( tskid )); _ITRON_return_errorno( _ITRON_Task_Clarify_get_id_error( tskid ));
case OBJECTS_LOCAL: case OBJECTS_LOCAL:
if (_States_Is_dormant( the_thread->current_state ))
_ITRON_return_errorno( E_OBJ );
if (( tskpri <= 0 ) || ( tskpri >= 256 ))
_ITRON_return_errorno( E_PAR );
new_priority = _ITRON_Task_Priority_to_Core( tskpri ); new_priority = _ITRON_Task_Priority_to_Core( tskpri );
the_thread->real_priority = new_priority; the_thread->real_priority = new_priority;
/* /*
* XXX This is from the rtems side and I'm not sure what this is for. * The priority should not be changed until later if priority
* XXX Is this check right or should change priority be called * inheratance has occured.
* regardless?
*/ */
if ( the_thread->resource_count == 0 || if ( the_thread->resource_count == 0 ||
the_thread->current_priority > new_priority ) the_thread->current_priority > new_priority )
_Thread_Change_priority( the_thread, new_priority, FALSE ); _Thread_Change_priority( the_thread, new_priority, FALSE );
_Thread_Enable_dispatch(); _ITRON_return_errorno( E_OK );
return E_OK;
} }
return E_OBJ; /* XXX - Should never get here */ _ITRON_return_errorno( E_OBJ ); /* XXX - Should never get here */
} }

25
cpukit/itron/src/chg_pri.c
View File

@@ -30,39 +30,34 @@ ER chg_pri(
Priority_Control new_priority; Priority_Control new_priority;
the_thread = _ITRON_Task_Get( tskid, &location ); the_thread = _ITRON_Task_Get( tskid, &location );
if (!the_thread)
_ITRON_return_errorno( _ITRON_Task_Clarify_get_id_error( tskid ) );
if (_States_Is_dormant( the_thread->current_state ))
return -1;
if (( tskpri <= 0 ) || ( tskpri >= 256 ))
_ITRON_return_errorno( E_PAR );
switch ( location ) { switch ( location ) {
case OBJECTS_REMOTE: case OBJECTS_REMOTE:
case OBJECTS_ERROR: case OBJECTS_ERROR:
_ITRON_return_errorno( _ITRON_Task_Clarify_get_id_error( tskid )); _ITRON_return_errorno( _ITRON_Task_Clarify_get_id_error( tskid ));
case OBJECTS_LOCAL: case OBJECTS_LOCAL:
if (_States_Is_dormant( the_thread->current_state ))
_ITRON_return_errorno( E_OBJ );
if (( tskpri <= 0 ) || ( tskpri >= 256 ))
_ITRON_return_errorno( E_PAR );
new_priority = _ITRON_Task_Priority_to_Core( tskpri ); new_priority = _ITRON_Task_Priority_to_Core( tskpri );
the_thread->real_priority = new_priority; the_thread->real_priority = new_priority;
/* /*
* XXX This is from the rtems side and I'm not sure what this is for. * The priority should not be changed until later if priority
* XXX Is this check right or should change priority be called * inheratance has occured.
* regardless?
*/ */
if ( the_thread->resource_count == 0 || if ( the_thread->resource_count == 0 ||
the_thread->current_priority > new_priority ) the_thread->current_priority > new_priority )
_Thread_Change_priority( the_thread, new_priority, FALSE ); _Thread_Change_priority( the_thread, new_priority, FALSE );
_Thread_Enable_dispatch(); _ITRON_return_errorno( E_OK );
return E_OK;
} }
return E_OBJ; /* XXX - Should never get here */ _ITRON_return_errorno( E_OBJ ); /* XXX - Should never get here */
} }