score: Rename Priority_bit_map_Control

Rename Priority_bit_map_Control in Priority_bit_map_Word.

1 files changed, 21 insertions, 21 deletions

diff --git a/cpukit/score/include/rtems/score/prioritybitmapimpl.h b/cpukit/score/include/rtems/score/prioritybitmapimpl.h
index 694ac9eeea..df65fb463f 100644
--- a/cpukit/score/include/rtems/score/prioritybitmapimpl.h
+++ b/cpukit/score/include/rtems/score/prioritybitmapimpl.h
@@ -32,7 +32,7 @@ extern "C" {
 /**@{**/
 
 /*
- * The Priority_bit_map_Control variables are instantiated only
+ * The Priority_bit_map_Word variables are instantiated only
  * if using the bit map handler.
  */
 
@@ -40,7 +40,7 @@ extern "C" {
  *  Each sixteen bit entry in this array is associated with one of
  *  the sixteen entries in the Priority Bit map.
  */
-extern volatile Priority_bit_map_Control _Priority_Major_bit_map;
+extern volatile Priority_bit_map_Word _Priority_Major_bit_map;
 
 /** Each bit in the Priority Bitmap indicates whether or not there are
  *  threads ready at a particular priority.  The mapping of
@@ -48,7 +48,7 @@ extern volatile Priority_bit_map_Control _Priority_Major_bit_map;
  *  dependent as is the value of each bit used to indicate that
  *  threads are ready at that priority.
  */
-extern Priority_bit_map_Control
+extern Priority_bit_map_Word
                _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
 
 #if ( CPU_USE_GENERIC_BITFIELD_DATA == TRUE )
@@ -91,9 +91,9 @@ extern const unsigned char __log2table[256];
     register const unsigned char *__p = __log2table; \
     \
     if ( __value < 0x100 ) \
-      (_bit_number) = (Priority_bit_map_Control)( __p[ __value ] + 8 );  \
+      (_bit_number) = (Priority_bit_map_Word)( __p[ __value ] + 8 );  \
     else \
-      (_bit_number) = (Priority_bit_map_Control)( __p[ __value >> 8 ] ); \
+      (_bit_number) = (Priority_bit_map_Word)( __p[ __value >> 8 ] ); \
   }
 #endif
 
@@ -130,22 +130,22 @@ extern const unsigned char __log2table[256];
  * This function returns the major portion of the_priority.
  */
 
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Major (
+RTEMS_INLINE_ROUTINE Priority_bit_map_Word   _Priority_Major (
   Priority_Control the_priority
 )
 {
-  return (Priority_bit_map_Control)( the_priority / 16 );
+  return (Priority_bit_map_Word)( the_priority / 16 );
 }
 
 /**
  * This function returns the minor portion of the_priority.
  */
 
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Minor (
+RTEMS_INLINE_ROUTINE Priority_bit_map_Word   _Priority_Minor (
   Priority_Control the_priority
 )
 {
-  return (Priority_bit_map_Control)( the_priority % 16 );
+  return (Priority_bit_map_Word)( the_priority % 16 );
 }
 
 #if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
@@ -155,22 +155,22 @@ RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Minor (
  * number passed to it.
  */
 
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Mask (
+RTEMS_INLINE_ROUTINE Priority_bit_map_Word   _Priority_Mask (
   uint32_t   bit_number
 )
 {
-  return (Priority_bit_map_Control)(0x8000u >> bit_number);
+  return (Priority_bit_map_Word)(0x8000u >> bit_number);
 }
 
 /**
  * This function returns the mask bit inverted.
  */
 
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Mask_invert (
+RTEMS_INLINE_ROUTINE Priority_bit_map_Word   _Priority_Mask_invert (
   uint32_t   mask
 )
 {
-  return (Priority_bit_map_Control)(~mask);
+  return (Priority_bit_map_Word)(~mask);
 }
 
 /**
@@ -195,7 +195,7 @@ RTEMS_INLINE_ROUTINE uint32_t   _Priority_Bits_index (
 /**
  *  This is the minor bit map.
  */
-extern Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
+extern Priority_bit_map_Word _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
 
 /**
  * This routine uses the_priority_map to update the priority
@@ -232,8 +232,8 @@ RTEMS_INLINE_ROUTINE void _Priority_bit_map_Remove (
 
 RTEMS_INLINE_ROUTINE Priority_Control _Priority_bit_map_Get_highest( void )
 {
-  Priority_bit_map_Control minor;
-  Priority_bit_map_Control major;
+  Priority_bit_map_Word minor;
+  Priority_bit_map_Word major;
 
   _Bitfield_Find_first_bit( _Priority_Major_bit_map, major );
   _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor );
@@ -258,9 +258,9 @@ RTEMS_INLINE_ROUTINE void _Priority_bit_map_Initialize_information(
   Priority_Control      new_priority
 )
 {
-  Priority_bit_map_Control major;
-  Priority_bit_map_Control minor;
-  Priority_bit_map_Control mask;
+  Priority_bit_map_Word major;
+  Priority_bit_map_Word minor;
+  Priority_bit_map_Word mask;
 
   major = _Priority_Major( new_priority );
   minor = _Priority_Minor( new_priority );
@@ -271,12 +271,12 @@ RTEMS_INLINE_ROUTINE void _Priority_bit_map_Initialize_information(
   mask = _Priority_Mask( major );
   the_priority_map->ready_major = mask;
   /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
-  the_priority_map->block_major = (Priority_bit_map_Control)(~((uint32_t)mask));
+  the_priority_map->block_major = (Priority_bit_map_Word)(~((uint32_t)mask));
 
   mask = _Priority_Mask( minor );
   the_priority_map->ready_minor = mask;
   /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
-  the_priority_map->block_minor = (Priority_bit_map_Control)(~((uint32_t)mask));
+  the_priority_map->block_minor = (Priority_bit_map_Word)(~((uint32_t)mask));
 }
 
 /** @} */