2010-07-29 Gedare Bloom <giddyup44@yahoo.com>

	PR 1635/cpukit
	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
	handling, to isolate the bitmap implementation of priorities in the
	supercore so that priority management is a little more modular. This
	change is in anticipation of scheduler implementations that can
	select how they manage tracking priority levels / finding the highest
	priority ready task. Note that most of the changes here are simple
	renaming, to clarify the use of the bitmap-based priority management.

33 files changed, 143 insertions, 22 deletions

diff --git a/cpukit/score/cpu/avr/ChangeLog b/cpukit/score/cpu/avr/ChangeLog
index af27e41e6d..df7dabac4d 100644
--- a/cpukit/score/cpu/avr/ChangeLog
+++ b/cpukit/score/cpu/avr/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-27	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/asm.h: Fixed header guard.
diff --git a/cpukit/score/cpu/avr/rtems/score/cpu.h b/cpukit/score/cpu/avr/rtems/score/cpu.h
index ce20506851..89c39aa161 100644
--- a/cpukit/score/cpu/avr/rtems/score/cpu.h
+++ b/cpukit/score/cpu/avr/rtems/score/cpu.h
@@ -814,7 +814,7 @@ uint32_t   _CPU_ISR_Get_level( void );
 
 /*
  *  This routine sets _output to the bit number of the first bit
- *  set in _value.  _value is of CPU dependent type Priority_Bit_map_control.
+ *  set in _value.  _value is of CPU dependent type Priority_bit_map_Control.
  *  This type may be either 16 or 32 bits wide although only the 16
  *  least significant bits will be used.
  *
diff --git a/cpukit/score/cpu/avr/rtems/score/types.h b/cpukit/score/cpu/avr/rtems/score/types.h
index 8bfdffa8a9..64f5343d5a 100644
--- a/cpukit/score/cpu/avr/rtems/score/types.h
+++ b/cpukit/score/cpu/avr/rtems/score/types.h
@@ -31,7 +31,7 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-typedef uint16_t     Priority_Bit_map_control;
+typedef uint16_t     Priority_bit_map_Control;
 typedef void avr_isr;
 typedef void ( *avr_isr_entry )( void );
 
diff --git a/cpukit/score/cpu/bfin/ChangeLog b/cpukit/score/cpu/bfin/ChangeLog
index b07bfecb22..a2281d9d07 100644
--- a/cpukit/score/cpu/bfin/ChangeLog
+++ b/cpukit/score/cpu/bfin/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-27	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Assembler compatibility fixes.
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/rtems/score/cpu.h
index d1b6b7f29b..3bfa128922 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/rtems/score/cpu.h
@@ -951,7 +951,7 @@ void _CPU_Context_Initialize(
  *  @ingroup CPUBitfield
  *  This routine sets @a _output to the bit number of the first bit
  *  set in @a _value.  @a _value is of CPU dependent type
- *  @a Priority_Bit_map_control.  This type may be either 16 or 32 bits
+ *  @a Priority_bit_map_Control.  This type may be either 16 or 32 bits
  *  wide although only the 16 least significant bits will be used.
  *
  *  There are a number of variables in using a "find first bit" type
diff --git a/cpukit/score/cpu/bfin/rtems/score/types.h b/cpukit/score/cpu/bfin/rtems/score/types.h
index b572f89e2d..bf833974ed 100644
--- a/cpukit/score/cpu/bfin/rtems/score/types.h
+++ b/cpukit/score/cpu/bfin/rtems/score/types.h
@@ -28,7 +28,7 @@ extern "C" {
  */
 
 /** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
 
 /** This defines the return type for an ISR entry point. */
 typedef void blackfin_isr;
diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog
index 3dff99e349..aba5af5bf4 100644
--- a/cpukit/score/cpu/h8300/ChangeLog
+++ b/cpukit/score/cpu/h8300/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-27	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Assembler compatibility fixes.
diff --git a/cpukit/score/cpu/h8300/rtems/score/cpu.h b/cpukit/score/cpu/h8300/rtems/score/cpu.h
index 75a73587d2..82f3e40355 100644
--- a/cpukit/score/cpu/h8300/rtems/score/cpu.h
+++ b/cpukit/score/cpu/h8300/rtems/score/cpu.h
@@ -844,7 +844,7 @@ uint32_t   _CPU_ISR_Get_level( void );
 
 /*
  *  This routine sets _output to the bit number of the first bit
- *  set in _value.  _value is of CPU dependent type Priority_Bit_map_control.
+ *  set in _value.  _value is of CPU dependent type Priority_bit_map_Control.
  *  This type may be either 16 or 32 bits wide although only the 16
  *  least significant bits will be used.
  *
diff --git a/cpukit/score/cpu/h8300/rtems/score/types.h b/cpukit/score/cpu/h8300/rtems/score/types.h
index 20bcf72543..e073ffb312 100644
--- a/cpukit/score/cpu/h8300/rtems/score/types.h
+++ b/cpukit/score/cpu/h8300/rtems/score/types.h
@@ -31,7 +31,7 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-typedef uint16_t     Priority_Bit_map_control;
+typedef uint16_t     Priority_bit_map_Control;
 typedef void h8300_isr;
 typedef void ( *h8300_isr_entry )( void );
 
diff --git a/cpukit/score/cpu/lm32/ChangeLog b/cpukit/score/cpu/lm32/ChangeLog
index a490f47e17..3d2fa04e1f 100644
--- a/cpukit/score/cpu/lm32/ChangeLog
+++ b/cpukit/score/cpu/lm32/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/rtems/score/cpu.h
index a71b1ca4ec..44d31e4efa 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu.h
+++ b/cpukit/score/cpu/lm32/rtems/score/cpu.h
@@ -956,7 +956,7 @@ extern char _gp[];
  *  @ingroup CPUBitfield
  *  This routine sets @a _output to the bit number of the first bit
  *  set in @a _value.  @a _value is of CPU dependent type
- *  @a Priority_Bit_map_control.  This type may be either 16 or 32 bits
+ *  @a Priority_bit_map_Control.  This type may be either 16 or 32 bits
  *  wide although only the 16 least significant bits will be used.
  *
  *  There are a number of variables in using a "find first bit" type
diff --git a/cpukit/score/cpu/lm32/rtems/score/types.h b/cpukit/score/cpu/lm32/rtems/score/types.h
index bf3297844f..a46dd75220 100644
--- a/cpukit/score/cpu/lm32/rtems/score/types.h
+++ b/cpukit/score/cpu/lm32/rtems/score/types.h
@@ -35,7 +35,7 @@ extern "C" {
  */
 
 /** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
 
 /** This defines the return type for an ISR entry point. */
 typedef void lm32_isr;
diff --git a/cpukit/score/cpu/m32c/ChangeLog b/cpukit/score/cpu/m32c/ChangeLog
index c1bcfc2100..85165efce6 100644
--- a/cpukit/score/cpu/m32c/ChangeLog
+++ b/cpukit/score/cpu/m32c/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/rtems/score/cpu.h
index ef77ff45dd..97715fe624 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/rtems/score/cpu.h
@@ -912,7 +912,7 @@ void _CPU_Context_Restart_self(
  *  @ingroup CPUBitfield
  *  This routine sets @a _output to the bit number of the first bit
  *  set in @a _value.  @a _value is of CPU dependent type
- *  @a Priority_Bit_map_control.  This type may be either 16 or 32 bits
+ *  @a Priority_bit_map_Control.  This type may be either 16 or 32 bits
  *  wide although only the 16 least significant bits will be used.
  *
  *  There are a number of variables in using a "find first bit" type
diff --git a/cpukit/score/cpu/m32c/rtems/score/types.h b/cpukit/score/cpu/m32c/rtems/score/types.h
index 8b3c28f4ac..f25f5a61ab 100644
--- a/cpukit/score/cpu/m32c/rtems/score/types.h
+++ b/cpukit/score/cpu/m32c/rtems/score/types.h
@@ -32,7 +32,7 @@ extern "C" {
  */
 
 /** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
 
 /** This defines the return type for an ISR entry point. */
 typedef void m32c_isr;
diff --git a/cpukit/score/cpu/m32r/ChangeLog b/cpukit/score/cpu/m32r/ChangeLog
index e2a5bf9842..50e79cc311 100644
--- a/cpukit/score/cpu/m32r/ChangeLog
+++ b/cpukit/score/cpu/m32r/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/m32r/rtems/score/cpu.h b/cpukit/score/cpu/m32r/rtems/score/cpu.h
index b56953c9e6..431cc1dab1 100644
--- a/cpukit/score/cpu/m32r/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32r/rtems/score/cpu.h
@@ -949,7 +949,7 @@ void _CPU_Context_Restart_self(
  *  @ingroup CPUBitfield
  *  This routine sets @a _output to the bit number of the first bit
  *  set in @a _value.  @a _value is of CPU dependent type
- *  @a Priority_Bit_map_control.  This type may be either 16 or 32 bits
+ *  @a Priority_bit_map_Control.  This type may be either 16 or 32 bits
  *  wide although only the 16 least significant bits will be used.
  *
  *  There are a number of variables in using a "find first bit" type
diff --git a/cpukit/score/cpu/m32r/rtems/score/types.h b/cpukit/score/cpu/m32r/rtems/score/types.h
index f435157466..9aa2294fd3 100644
--- a/cpukit/score/cpu/m32r/rtems/score/types.h
+++ b/cpukit/score/cpu/m32r/rtems/score/types.h
@@ -32,7 +32,7 @@ extern "C" {
  */
 
 /** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
 
 /** This defines the return type for an ISR entry point. */
 typedef void m32r_isr;
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index 5f5643dac1..a163778681 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h
index c6592884ab..f0eb250d68 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpu.h
+++ b/cpukit/score/cpu/mips/rtems/score/cpu.h
@@ -909,7 +909,7 @@ extern void mips_break( int error );
 
 /*
  *  This routine sets _output to the bit number of the first bit
- *  set in _value.  _value is of CPU dependent type Priority_Bit_map_control.
+ *  set in _value.  _value is of CPU dependent type Priority_bit_map_Control.
  *  This type may be either 16 or 32 bits wide although only the 16
  *  least significant bits will be used.
  *
diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/cpukit/score/cpu/mips/rtems/score/types.h
index e6a8de96bc..67b253bcf8 100644
--- a/cpukit/score/cpu/mips/rtems/score/types.h
+++ b/cpukit/score/cpu/mips/rtems/score/types.h
@@ -32,7 +32,7 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-typedef uint16_t     Priority_Bit_map_control;
+typedef uint16_t     Priority_bit_map_Control;
 typedef void mips_isr;
 typedef void ( *mips_isr_entry )( void );
 
diff --git a/cpukit/score/cpu/nios2/ChangeLog b/cpukit/score/cpu/nios2/ChangeLog
index dc4e2a3d45..258e9ece4b 100644
--- a/cpukit/score/cpu/nios2/ChangeLog
+++ b/cpukit/score/cpu/nios2/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/rtems/score/cpu.h
index 7e7f30c97d..b08a9b67ed 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpu.h
+++ b/cpukit/score/cpu/nios2/rtems/score/cpu.h
@@ -1000,7 +1000,7 @@ uint32_t   _CPU_ISR_Get_level( void );
  *  @ingroup CPUBitfield
  *  This routine sets @a _output to the bit number of the first bit
  *  set in @a _value.  @a _value is of CPU dependent type
- *  @a Priority_Bit_map_control.  This type may be either 16 or 32 bits
+ *  @a Priority_bit_map_Control.  This type may be either 16 or 32 bits
  *  wide although only the 16 least significant bits will be used.
  *
  *  There are a number of variables in using a "find first bit" type
diff --git a/cpukit/score/cpu/nios2/rtems/score/types.h b/cpukit/score/cpu/nios2/rtems/score/types.h
index 1c577a25c8..7420bd8c18 100644
--- a/cpukit/score/cpu/nios2/rtems/score/types.h
+++ b/cpukit/score/cpu/nios2/rtems/score/types.h
@@ -31,7 +31,7 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
 typedef void nios2_isr;
 typedef void ( *nios2_isr_entry )( void );
 
diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog
index 770ec013b9..467dfe8203 100644
--- a/cpukit/score/cpu/no_cpu/ChangeLog
+++ b/cpukit/score/cpu/no_cpu/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
index d51a421efc..a731eb7d1a 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
@@ -936,7 +936,7 @@ uint32_t   _CPU_ISR_Get_level( void );
  *  @ingroup CPUBitfield
  *  This routine sets @a _output to the bit number of the first bit
  *  set in @a _value.  @a _value is of CPU dependent type
- *  @a Priority_Bit_map_control.  This type may be either 16 or 32 bits
+ *  @a Priority_bit_map_Control.  This type may be either 16 or 32 bits
  *  wide although only the 16 least significant bits will be used.
  *
  *  There are a number of variables in using a "find first bit" type
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/rtems/score/types.h
index 89985a2d44..c1fdc6d9a4 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/types.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/types.h
@@ -32,7 +32,7 @@ extern "C" {
  */
 
 /** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
 
 /** This defines the return type for an ISR entry point. */
 typedef void no_cpu_isr;
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog
index fae59e4268..7db74fc1bf 100644
--- a/cpukit/score/cpu/powerpc/ChangeLog
+++ b/cpukit/score/cpu/powerpc/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/new-exceptions/cpu.h: Removed file.
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
index 2dfd4f5fb8..bdeef06d64 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
@@ -762,7 +762,7 @@ void _CPU_Context_Initialize(
 
 /*
  *  This routine sets _output to the bit number of the first bit
- *  set in _value.  _value is of CPU dependent type Priority_Bit_map_control.
+ *  set in _value.  _value is of CPU dependent type Priority_bit_map_Control.
  *  This type may be either 16 or 32 bits wide although only the 16
  *  least significant bits will be used.
  *
diff --git a/cpukit/score/cpu/powerpc/rtems/score/types.h b/cpukit/score/cpu/powerpc/rtems/score/types.h
index 76c280f21a..828a363934 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/types.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/types.h
@@ -47,7 +47,7 @@ extern "C" {
 /*
  *  This section defines the basic types for this processor.
  */
-typedef uint32_t     Priority_Bit_map_control;
+typedef uint32_t     Priority_bit_map_Control;
 typedef void ppc_isr;
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog
index 22f0eb2247..5c4e9b3bd4 100644
--- a/cpukit/score/cpu/sh/ChangeLog
+++ b/cpukit/score/cpu/sh/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-29	Gedare Bloom <giddyup44@yahoo.com>
+
+	PR 1635/cpukit
+	* rtems/score/cpu.h, rtems/score/types.h: Refactoring of priority
+	handling, to isolate the bitmap implementation of priorities in the
+	supercore so that priority management is a little more modular. This
+	change is in anticipation of scheduler implementations that can
+	select how they manage tracking priority levels / finding the highest
+	priority ready task. Note that most of the changes here are simple
+	renaming, to clarify the use of the bitmap-based priority management.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/cpukit/score/cpu/sh/rtems/score/cpu.h
index 946b58cac5..4e5167517c 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sh/rtems/score/cpu.h
@@ -682,7 +682,7 @@ SCORE_EXTERN void _CPU_Context_Initialize(
 
 /*
  *  This routine sets _output to the bit number of the first bit
- *  set in _value.  _value is of CPU dependent type Priority_Bit_map_control.
+ *  set in _value.  _value is of CPU dependent type Priority_bit_map_Control.
  *  This type may be either 16 or 32 bits wide although only the 16
  *  least significant bits will be used.
  *
diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/cpukit/score/cpu/sh/rtems/score/types.h
index bb17f96b61..f367422d2b 100644
--- a/cpukit/score/cpu/sh/rtems/score/types.h
+++ b/cpukit/score/cpu/sh/rtems/score/types.h
@@ -41,7 +41,7 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-typedef uint16_t     Priority_Bit_map_control;
+typedef uint16_t     Priority_bit_map_Control;
 
 typedef void sh_isr;
 typedef void ( *sh_isr_entry )( void );