diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/score/Makefile.am | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/schedulersimple.h | 20 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/schedulersimpleimpl.h (renamed from cpukit/score/inline/rtems/score/schedulersimple.inl) | 16 | ||||
-rw-r--r-- | cpukit/score/preinstall.am | 8 | ||||
-rw-r--r-- | cpukit/score/src/schedulersimplereadyqueueenqueue.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/schedulersimplereadyqueueenqueuefirst.c | 5 | ||||
-rw-r--r-- | cpukit/score/src/schedulersimplesmp.c | 1 | ||||
-rw-r--r-- | cpukit/score/src/schedulersimpleyield.c | 5 |
8 files changed, 27 insertions, 36 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 06b6f11c23..f04a904f94 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -48,6 +48,7 @@ include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h +include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h include_rtems_score_HEADERS += include/rtems/score/smp.h include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/stack.h @@ -99,7 +100,6 @@ include_rtems_score_HEADERS += inline/rtems/score/object.inl include_rtems_score_HEADERS += inline/rtems/score/prioritybitmap.inl include_rtems_score_HEADERS += inline/rtems/score/scheduler.inl include_rtems_score_HEADERS += inline/rtems/score/schedulerpriority.inl -include_rtems_score_HEADERS += inline/rtems/score/schedulersimple.inl include_rtems_score_HEADERS += inline/rtems/score/states.inl include_rtems_score_HEADERS += inline/rtems/score/thread.inl include_rtems_score_HEADERS += inline/rtems/score/threadq.inl diff --git a/cpukit/score/include/rtems/score/schedulersimple.h b/cpukit/score/include/rtems/score/schedulersimple.h index 17514cc4c2..ba67c14729 100644 --- a/cpukit/score/include/rtems/score/schedulersimple.h +++ b/cpukit/score/include/rtems/score/schedulersimple.h @@ -18,6 +18,13 @@ #ifndef _RTEMS_SCORE_SCHEDULERSIMPLE_H #define _RTEMS_SCORE_SCHEDULERSIMPLE_H +#include <rtems/score/scheduler.h> +#include <rtems/score/schedulerpriority.h> + +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup ScoreSchedulerSimple Simple Priority Scheduler * @@ -25,13 +32,6 @@ */ /**@{*/ -#ifdef __cplusplus -extern "C" { -#endif - -#include <rtems/score/scheduler.h> -#include <rtems/score/schedulerpriority.h> - /** * Entry points for Scheduler Simple */ @@ -215,15 +215,11 @@ void _Scheduler_simple_Ready_queue_enqueue_first( Thread_Control *the_thread ); -#ifndef __RTEMS_APPLICATION__ -#include <rtems/score/schedulersimple.inl> -#endif +/**@}*/ #ifdef __cplusplus } #endif -/**@}*/ - #endif /* end of include file */ diff --git a/cpukit/score/inline/rtems/score/schedulersimple.inl b/cpukit/score/include/rtems/score/schedulersimpleimpl.h index 8b2480ea0a..e8c4cc6cad 100644 --- a/cpukit/score/inline/rtems/score/schedulersimple.inl +++ b/cpukit/score/include/rtems/score/schedulersimpleimpl.h @@ -16,14 +16,14 @@ * http://www.rtems.com/license/LICENSE. */ -#ifndef _RTEMS_SCORE_SCHEDULERSIMPLE_H -# error "Never use <rtems/score/schedulersimple.inl> directly; include <rtems/score/schedulersimple.h> instead." -#endif +#ifndef _RTEMS_SCORE_SCHEDULERSIMPLEIMPL_H +#define _RTEMS_SCORE_SCHEDULERSIMPLEIMPL_H -#ifndef _RTEMS_SCORE_SCHEDULERSIMPLE_INL -#define _RTEMS_SCORE_SCHEDULERSIMPLE_INL +#include <rtems/score/schedulersimple.h> -#include <rtems/score/thread.h> +#ifdef __cplusplus +extern "C" { +#endif /** * @addtogroup ScoreScheduler @@ -96,5 +96,9 @@ RTEMS_INLINE_ROUTINE void _Scheduler_simple_Insert_priority_fifo( /** @} */ +#ifdef __cplusplus +} +#endif + #endif /* end of include file */ diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 3bfc582830..35b57d055a 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -175,6 +175,10 @@ $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h: include/rtems/score/schedulers $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h +$(PROJECT_INCLUDE)/rtems/score/schedulersimpleimpl.h: include/rtems/score/schedulersimpleimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimpleimpl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimpleimpl.h + $(PROJECT_INCLUDE)/rtems/score/smp.h: include/rtems/score/smp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smp.h @@ -327,10 +331,6 @@ $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.inl: inline/rtems/score/schedul $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.inl -$(PROJECT_INCLUDE)/rtems/score/schedulersimple.inl: inline/rtems/score/schedulersimple.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimple.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimple.inl - $(PROJECT_INCLUDE)/rtems/score/states.inl: inline/rtems/score/states.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl diff --git a/cpukit/score/src/schedulersimplereadyqueueenqueue.c b/cpukit/score/src/schedulersimplereadyqueueenqueue.c index b33512f902..990f47dbff 100644 --- a/cpukit/score/src/schedulersimplereadyqueueenqueue.c +++ b/cpukit/score/src/schedulersimplereadyqueueenqueue.c @@ -18,11 +18,7 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/chain.h> -#include <rtems/score/isr.h> -#include <rtems/score/thread.h> -#include <rtems/score/schedulersimple.h> +#include <rtems/score/schedulersimpleimpl.h> void _Scheduler_simple_Ready_queue_enqueue( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulersimplereadyqueueenqueuefirst.c b/cpukit/score/src/schedulersimplereadyqueueenqueuefirst.c index c5ee8ebe12..8db729ccf1 100644 --- a/cpukit/score/src/schedulersimplereadyqueueenqueuefirst.c +++ b/cpukit/score/src/schedulersimplereadyqueueenqueuefirst.c @@ -18,10 +18,7 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/chain.h> -#include <rtems/score/thread.h> -#include <rtems/score/schedulersimple.h> +#include <rtems/score/schedulersimpleimpl.h> void _Scheduler_simple_Ready_queue_enqueue_first( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulersimplesmp.c b/cpukit/score/src/schedulersimplesmp.c index ec1b0e27f4..b197af5cd8 100644 --- a/cpukit/score/src/schedulersimplesmp.c +++ b/cpukit/score/src/schedulersimplesmp.c @@ -19,6 +19,7 @@ #endif #include <rtems/score/schedulersimplesmp.h> +#include <rtems/score/schedulersimpleimpl.h> static Scheduler_simple_smp_Control *_Scheduler_simple_smp_Instance( void ) { diff --git a/cpukit/score/src/schedulersimpleyield.c b/cpukit/score/src/schedulersimpleyield.c index cfbe7a4cba..05f803e791 100644 --- a/cpukit/score/src/schedulersimpleyield.c +++ b/cpukit/score/src/schedulersimpleyield.c @@ -18,11 +18,8 @@ #include "config.h" #endif -#include <rtems/system.h> +#include <rtems/score/schedulersimpleimpl.h> #include <rtems/score/isr.h> -#include <rtems/score/scheduler.h> -#include <rtems/score/thread.h> -#include <rtems/score/schedulersimple.h> void _Scheduler_simple_Yield( Thread_Control *thread ) { |