4 files changed, 23 insertions, 10 deletions
diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl
index 687ffd923b..b6ae73a351 100644
--- a/cpukit/score/inline/rtems/score/object.inl
+++ b/cpukit/score/inline/rtems/score/object.inl
@@ -76,6 +76,19 @@ STATIC INLINE unsigned32 rtems_get_index(
 
 /*PAGE
  *
+ *  _Objects_Is_class_valid
+ *
+ */
+ 
+STATIC INLINE boolean _Objects_Is_class_valid(
+  Objects_Classes the_class
+)
+{
+  return the_class <= OBJECTS_CLASSES_LAST;
+}
+
+/*PAGE
+ *
  *  _Objects_Is_local_node
  *
  */
diff --git a/cpukit/score/inline/rtems/score/priority.inl b/cpukit/score/inline/rtems/score/priority.inl
index 9e7c159f65..b2bc8535ff 100644
--- a/cpukit/score/inline/rtems/score/priority.inl
+++ b/cpukit/score/inline/rtems/score/priority.inl
@@ -41,7 +41,7 @@ STATIC INLINE void _Priority_Handler_initialization( void )
  */
 
 STATIC INLINE boolean _Priority_Is_valid (
-  rtems_task_priority the_priority
+  Priority_Control the_priority
 )
 {
   return (  ( the_priority >= RTEMS_MINIMUM_PRIORITY ) &&
@@ -55,7 +55,7 @@ STATIC INLINE boolean _Priority_Is_valid (
  */
 
 STATIC INLINE unsigned32 _Priority_Major (
-  rtems_task_priority the_priority
+  Priority_Control the_priority
 )
 {
   return ( the_priority / 16 );
@@ -68,7 +68,7 @@ STATIC INLINE unsigned32 _Priority_Major (
  */
 
 STATIC INLINE unsigned32 _Priority_Minor (
-  rtems_task_priority the_priority
+  Priority_Control the_priority
 )
 {
   return ( the_priority % 16 );
@@ -109,7 +109,7 @@ STATIC INLINE void _Priority_Remove_from_bit_map (
  *
  */
 
-STATIC INLINE rtems_task_priority _Priority_Get_highest( void )
+STATIC INLINE Priority_Control _Priority_Get_highest( void )
 {
   Priority_Bit_map_control minor;
   Priority_Bit_map_control major;
@@ -129,7 +129,7 @@ STATIC INLINE rtems_task_priority _Priority_Get_highest( void )
 
 STATIC INLINE void _Priority_Initialize_information(
   Priority_Information *the_priority_map,
-  rtems_task_priority      new_priority
+  Priority_Control      new_priority
 )
 {
   Priority_Bit_map_control major;
@@ -158,7 +158,7 @@ STATIC INLINE void _Priority_Initialize_information(
  */
 
 STATIC INLINE boolean _Priority_Is_group_empty (
-  rtems_task_priority      the_priority
+  Priority_Control      the_priority
 )
 {
   return the_priority == 0;
diff --git a/cpukit/score/inline/rtems/score/tqdata.inl b/cpukit/score/inline/rtems/score/tqdata.inl
index 7ec1e9e186..3168d058f5 100644
--- a/cpukit/score/inline/rtems/score/tqdata.inl
+++ b/cpukit/score/inline/rtems/score/tqdata.inl
@@ -24,7 +24,7 @@
  */
 
 STATIC INLINE unsigned32 _Thread_queue_Header_number (
-  rtems_task_priority the_priority
+  Priority_Control the_priority
 )
 {
   return ( the_priority >> 6 );
@@ -37,7 +37,7 @@ STATIC INLINE unsigned32 _Thread_queue_Header_number (
  */
 
 STATIC INLINE boolean _Thread_queue_Is_reverse_search (
-  rtems_task_priority the_priority
+  Priority_Control the_priority
 )
 {
   return ( the_priority & 0x20 );
diff --git a/cpukit/score/inline/rtems/score/userext.inl b/cpukit/score/inline/rtems/score/userext.inl
index 1558da968a..fa5a31c37b 100644
--- a/cpukit/score/inline/rtems/score/userext.inl
+++ b/cpukit/score/inline/rtems/score/userext.inl
@@ -41,8 +41,8 @@ STATIC INLINE void _User_extensions_Handler_initialization (
  */
 
 STATIC INLINE void _User_extensions_Add_set (
-  User_extensions_Control       *the_extension,
-  rtems_extensions_table *extension_table
+  User_extensions_Control *the_extension,
+  rtems_extensions_table  *extension_table
 )
 {
   the_extension->Callouts = *extension_table;