summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-11-08 13:12:32 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-11-12 13:25:41 +0100
commita11b98c906a85292055d297ec92c15b342f0f52b (patch)
tree5d786326bfafc56d64b4647884894d6fbbb23f4e
parentscore: Remove empty <rtems/score/tod.h> (diff)
downloadrtems-a11b98c906a85292055d297ec92c15b342f0f52b.tar.bz2
score: Avoid include of <rtems/score/thread.h>
Update #3598.
-rw-r--r--cpukit/include/rtems/score/userext.h29
-rw-r--r--cpukit/include/rtems/score/userextimpl.h3
2 files changed, 17 insertions, 15 deletions
diff --git a/cpukit/include/rtems/score/userext.h b/cpukit/include/rtems/score/userext.h
index 5af5824808..7b80227f37 100644
--- a/cpukit/include/rtems/score/userext.h
+++ b/cpukit/include/rtems/score/userext.h
@@ -20,12 +20,13 @@
#include <rtems/score/interr.h>
#include <rtems/score/chain.h>
-#include <rtems/score/thread.h>
#ifdef __cplusplus
extern "C" {
#endif
+struct _Thread_Control;
+
typedef void User_extensions_routine RTEMS_DEPRECATED;
/**
@@ -69,8 +70,8 @@ typedef void User_extensions_routine RTEMS_DEPRECATED;
* return @a false and the entire thread create operation will fail.
*/
typedef bool ( *User_extensions_thread_create_extension )(
- Thread_Control *executing,
- Thread_Control *created
+ struct _Thread_Control *executing,
+ struct _Thread_Control *created
);
/**
@@ -89,8 +90,8 @@ typedef bool ( *User_extensions_thread_create_extension )(
* @param[in] deleted The deleted thread.
*/
typedef void( *User_extensions_thread_delete_extension )(
- Thread_Control *executing,
- Thread_Control *deleted
+ struct _Thread_Control *executing,
+ struct _Thread_Control *deleted
);
/**
@@ -109,8 +110,8 @@ typedef void( *User_extensions_thread_delete_extension )(
* @param[in] started The started thread.
*/
typedef void( *User_extensions_thread_start_extension )(
- Thread_Control *executing,
- Thread_Control *started
+ struct _Thread_Control *executing,
+ struct _Thread_Control *started
);
/**
@@ -131,8 +132,8 @@ typedef void( *User_extensions_thread_start_extension )(
* @param[in] restarted The executing thread. Yes, the executing thread.
*/
typedef void( *User_extensions_thread_restart_extension )(
- Thread_Control *executing,
- Thread_Control *restarted
+ struct _Thread_Control *executing,
+ struct _Thread_Control *restarted
);
/**
@@ -154,8 +155,8 @@ typedef void( *User_extensions_thread_restart_extension )(
* @param[in] heir The heir thread.
*/
typedef void( *User_extensions_thread_switch_extension )(
- Thread_Control *executing,
- Thread_Control *heir
+ struct _Thread_Control *executing,
+ struct _Thread_Control *heir
);
/**
@@ -169,7 +170,7 @@ typedef void( *User_extensions_thread_switch_extension )(
* @param[in] executing The executing thread.
*/
typedef void( *User_extensions_thread_begin_extension )(
- Thread_Control *executing
+ struct _Thread_Control *executing
);
/**
@@ -183,7 +184,7 @@ typedef void( *User_extensions_thread_begin_extension )(
* @param[in] executing The executing thread.
*/
typedef void( *User_extensions_thread_exitted_extension )(
- Thread_Control *executing
+ struct _Thread_Control *executing
);
/**
@@ -223,7 +224,7 @@ typedef void( *User_extensions_fatal_extension )(
* @param[in] terminated The terminated thread.
*/
typedef void( *User_extensions_thread_terminate_extension )(
- Thread_Control *terminated
+ struct _Thread_Control *terminated
);
/**
diff --git a/cpukit/include/rtems/score/userextimpl.h b/cpukit/include/rtems/score/userextimpl.h
index 5ad2c63765..a842ae8e86 100644
--- a/cpukit/include/rtems/score/userextimpl.h
+++ b/cpukit/include/rtems/score/userextimpl.h
@@ -19,8 +19,9 @@
#define _RTEMS_SCORE_USEREXTIMPL_H
#include <rtems/score/userext.h>
-#include <rtems/score/isrlock.h>
#include <rtems/score/chainimpl.h>
+#include <rtems/score/isrlock.h>
+#include <rtems/score/thread.h>
#include <rtems/score/percpu.h>
#ifdef __cplusplus