diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-24 12:03:31 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-26 11:55:44 +0200 |
| commit | f068384e3c8fd31d4791e22b4c91e29fa907ff3b (patch) | |
| tree | 45e5ff2ff56ac3288b6ebbefbb306ce5fb8f2cee /cpukit/score/include/rtems/score | |
| parent | score: Create schedulersimple impl header (diff) | |
| download | rtems-f068384e3c8fd31d4791e22b4c91e29fa907ff3b.tar.bz2 | |
score: Create schedulerpriority impl header
Move implementation specific parts of schedulerpriority.h and
schedulerpriority.inl into new header file schedulerpriorityimpl.h. The
schedulerpriority.h contains now only the application visible API.
Add missing includes. Remove superfluous includes.
Move declaration of _Priority_Bit_map to prioritybitmap.inl since this
variable is used only here.
Remove second declaration of _Priority_Major_bit_map.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/include/rtems/score/schedulerpriority.h | 18 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/schedulerpriorityimpl.h (renamed from cpukit/score/inline/rtems/score/schedulerpriority.inl) | 18 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/schedulersimpleimpl.h | 2 |
3 files changed, 15 insertions, 23 deletions
diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/cpukit/score/include/rtems/score/schedulerpriority.h index abd48196f2..862f9e1c7d 100644 --- a/cpukit/score/include/rtems/score/schedulerpriority.h +++ b/cpukit/score/include/rtems/score/schedulerpriority.h @@ -20,7 +20,7 @@ #define _RTEMS_SCORE_SCHEDULERPRIORITY_H #include <rtems/score/chain.h> -#include <rtems/score/priority.h> +#include <rtems/score/prioritybitmap.h> #include <rtems/score/scheduler.h> #ifdef __cplusplus @@ -225,25 +225,11 @@ void _Scheduler_priority_Release_job ( uint32_t deadline ); -/** - * This is the major bit map. - */ -extern volatile Priority_bit_map_Control _Priority_Major_bit_map; - -/** - * This is the minor bit map. - */ -extern Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT; - -#ifndef __RTEMS_APPLICATION__ -#include <rtems/score/schedulerpriority.inl> -#endif +/**@}*/ #ifdef __cplusplus } #endif -/**@}*/ - #endif /* end of include file */ diff --git a/cpukit/score/inline/rtems/score/schedulerpriority.inl b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h index 393ee09062..03568ed141 100644 --- a/cpukit/score/inline/rtems/score/schedulerpriority.inl +++ b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h @@ -17,17 +17,17 @@ * http://www.rtems.com/license/LICENSE. */ -#ifndef _RTEMS_SCORE_SCHEDULERPRIORITY_H -# error "Never use <rtems/score/schedulerpriority.inl> directly; include <rtems/score/schedulerpriority.h> instead." -#endif - -#ifndef _RTEMS_SCORE_SCHEDULERPRIORITY_INL -#define _RTEMS_SCORE_SCHEDULERPRIORITY_INL +#ifndef _RTEMS_SCORE_SCHEDULERPRIORITYIMPL_H +#define _RTEMS_SCORE_SCHEDULERPRIORITYIMPL_H +#include <rtems/score/schedulerpriority.h> #include <rtems/score/chainimpl.h> -#include <rtems/score/thread.h> #include <rtems/score/wkspace.h> +#ifdef __cplusplus +extern "C" { +#endif + /** * @addtogroup ScoreScheduler */ @@ -206,5 +206,9 @@ RTEMS_INLINE_ROUTINE int _Scheduler_priority_Priority_compare_body( /** @} */ +#ifdef __cplusplus +} +#endif + #endif /* end of include file */ diff --git a/cpukit/score/include/rtems/score/schedulersimpleimpl.h b/cpukit/score/include/rtems/score/schedulersimpleimpl.h index e8c4cc6cad..076d1a9258 100644 --- a/cpukit/score/include/rtems/score/schedulersimpleimpl.h +++ b/cpukit/score/include/rtems/score/schedulersimpleimpl.h @@ -20,6 +20,8 @@ #define _RTEMS_SCORE_SCHEDULERSIMPLEIMPL_H #include <rtems/score/schedulersimple.h> +#include <rtems/score/chainimpl.h> +#include <rtems/score/thread.h> #ifdef __cplusplus extern "C" { |