mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2026-08-28 20:01:03 +08:00
score: Rename Priority_bit_map_Control
Rename Priority_bit_map_Control in Priority_bit_map_Word.
This commit is contained in:
@@ -37,7 +37,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_Word;
|
||||
|
||||
/** @} */
|
||||
|
||||
|
||||
@@ -824,7 +824,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_Word.
|
||||
* This type may be either 16 or 32 bits wide although only the 16
|
||||
* least significant bits will be used.
|
||||
*
|
||||
|
||||
@@ -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_Word;
|
||||
typedef void avr_isr;
|
||||
typedef void ( *avr_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -953,7 +953,7 @@ void _CPU_Context_Initialize(
|
||||
/**
|
||||
* 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_Word. 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
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
/** This defines the return type for an ISR entry point. */
|
||||
typedef void blackfin_isr;
|
||||
|
||||
@@ -858,7 +858,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_Word.
|
||||
* This type may be either 16 or 32 bits wide although only the 16
|
||||
* least significant bits will be used.
|
||||
*
|
||||
|
||||
@@ -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_Word;
|
||||
typedef void h8300_isr;
|
||||
typedef void ( *h8300_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -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_Word;
|
||||
typedef void i386_isr;
|
||||
typedef i386_isr ( *i386_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -950,7 +950,7 @@ extern char _gp[];
|
||||
/**
|
||||
* 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_Word. 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
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -941,7 +941,7 @@ void _CPU_Context_Restart_self(
|
||||
/**
|
||||
* 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_Word. 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
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
/** This defines the return type for an ISR entry point. */
|
||||
typedef void m32c_isr;
|
||||
|
||||
@@ -959,7 +959,7 @@ void _CPU_Context_Restart_self(
|
||||
/**
|
||||
* 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_Word. 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
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
/** This defines the return type for an ISR entry point. */
|
||||
typedef void m32r_isr;
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -937,7 +937,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_Word.
|
||||
* This type may be either 16 or 32 bits wide although only the 16
|
||||
* least significant bits will be used.
|
||||
*
|
||||
|
||||
@@ -40,7 +40,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_Word;
|
||||
typedef void mips_isr;
|
||||
typedef void ( *mips_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -34,7 +34,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_Word;
|
||||
typedef void moxie_isr;
|
||||
typedef void ( *moxie_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -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_Word;
|
||||
typedef void nios2_isr;
|
||||
typedef void ( *nios2_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -1059,7 +1059,7 @@ uint32_t _CPU_ISR_Get_level( void );
|
||||
/**
|
||||
* 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_Word. 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
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -878,7 +878,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_Word.
|
||||
* This type may be either 16 or 32 bits wide although only the 16
|
||||
* least significant bits will be used.
|
||||
*
|
||||
|
||||
@@ -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_Word;
|
||||
typedef void ppc_isr;
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -691,7 +691,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_Word.
|
||||
* This type may be either 16 or 32 bits wide although only the 16
|
||||
* least significant bits will be used.
|
||||
*
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
typedef void sh_isr;
|
||||
typedef void ( *sh_isr_entry )( void );
|
||||
|
||||
@@ -34,7 +34,7 @@ extern "C" {
|
||||
* for using 16-bit variables. With no overriding architectural factors,
|
||||
* just using a uint16_t.
|
||||
*/
|
||||
typedef uint16_t Priority_bit_map_Control;
|
||||
typedef uint16_t Priority_bit_map_Word;
|
||||
|
||||
/**
|
||||
* @brief SPARC ISR handler return type.
|
||||
|
||||
@@ -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_Word;
|
||||
typedef void sparc_isr;
|
||||
typedef void ( *sparc_isr_entry )( void );
|
||||
|
||||
|
||||
@@ -935,7 +935,7 @@ void _CPU_Context_Initialize(
|
||||
/**
|
||||
* 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_Word. 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
|
||||
|
||||
@@ -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_Word;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ extern "C" {
|
||||
/**@{*/
|
||||
|
||||
/*
|
||||
* The definition of the Priority_bit_map_Control type is CPU dependent.
|
||||
* The definition of the Priority_bit_map_Word type is CPU dependent.
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -43,15 +43,15 @@ extern "C" {
|
||||
*/
|
||||
typedef struct {
|
||||
/** This is the address of minor bit map slot. */
|
||||
Priority_bit_map_Control *minor;
|
||||
Priority_bit_map_Word *minor;
|
||||
/** This is the priority bit map ready mask. */
|
||||
Priority_bit_map_Control ready_major;
|
||||
Priority_bit_map_Word ready_major;
|
||||
/** This is the priority bit map ready mask. */
|
||||
Priority_bit_map_Control ready_minor;
|
||||
Priority_bit_map_Word ready_minor;
|
||||
/** This is the priority bit map block mask. */
|
||||
Priority_bit_map_Control block_major;
|
||||
Priority_bit_map_Word block_major;
|
||||
/** This is the priority bit map block mask. */
|
||||
Priority_bit_map_Control block_minor;
|
||||
Priority_bit_map_Word block_minor;
|
||||
} Priority_bit_map_Information;
|
||||
|
||||
/**@}*/
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
/** @} */
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <rtems/score/prioritybitmapimpl.h>
|
||||
|
||||
Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
|
||||
Priority_bit_map_Word _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
|
||||
|
||||
/* Instantiate any global variables needed by the priority scheduler */
|
||||
volatile Priority_bit_map_Control _Priority_Major_bit_map;
|
||||
volatile Priority_bit_map_Word _Priority_Major_bit_map;
|
||||
|
||||
Reference in New Issue
Block a user