Changeset 2183b65 in rtems for c/src/exec/itron/src/chg_pri.c

Timestamp:

11/12/99 21:13:52 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

c257429f

Parents:

ea6bfcb

Message:

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

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.

File:

• c/src/exec/itron/src/chg_pri.c (modified) (3 diffs)

c/src/exec/itron/src/chg_pri.c

@@ -31 +31 @@
 
   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 ) {
     case OBJECTS_REMOTE:
@@ -46 +37 @@
 
     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 );
       the_thread->real_priority = new_priority;
 
       /*
-       * XXX This is from the rtems side and I'm not sure what this is for.
-       * XXX Is this check right or should change priority be called 
-       *     regardless?
+       * The priority should not be changed until later if priority
+       * inheratance has occured.
        */
 
@@ -59 +55 @@
         _Thread_Change_priority( the_thread, new_priority, FALSE );
 
-      _Thread_Enable_dispatch();
-      return E_OK;
+       _ITRON_return_errorno( E_OK );
   }
 
-  return E_OBJ;  /* XXX - Should never get here */
+  _ITRON_return_errorno( E_OBJ );  /* XXX - Should never get here */
 }