summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-24 16:50:27 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-26 11:55:45 +0200
commit8d0bf3224b862a0789ecd12ae5ddfb1c7fb6410a (patch)
tree0885788d6c3949f5b9d72d4836bf1ec3d1ecaf77
parentscore: Merge threadmp implementation into one file (diff)
downloadrtems-8d0bf3224b862a0789ecd12ae5ddfb1c7fb6410a.tar.bz2
score: Delete threadq.inl
-rw-r--r--cpukit/score/Makefile.am1
-rw-r--r--cpukit/score/include/rtems/score/threadq.h26
-rw-r--r--cpukit/score/inline/rtems/score/threadq.inl36
-rw-r--r--cpukit/score/preinstall.am4
4 files changed, 11 insertions, 56 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index f8333c8dfc..be9dcc285a 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -101,7 +101,6 @@ endif
## inline
include_rtems_score_HEADERS += inline/rtems/score/object.inl
-include_rtems_score_HEADERS += inline/rtems/score/threadq.inl
include_rtems_score_HEADERS += inline/rtems/score/tod.inl
include_rtems_score_HEADERS += inline/rtems/score/tqdata.inl
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h
index 1be336993c..3fec37953c 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/cpukit/score/include/rtems/score/threadq.h
@@ -19,16 +19,6 @@
#ifndef _RTEMS_SCORE_THREADQ_H
#define _RTEMS_SCORE_THREADQ_H
-/**
- * @defgroup ScoreThreadQ Thread Queue Handler
- *
- * @ingroup Score
- *
- * This handler encapsulates functionality related to managing sets of threads
- * blocked waiting for resources.
- */
-/**@{*/
-
#include <rtems/score/tqdata.h>
#include <rtems/score/object.h>
@@ -40,6 +30,16 @@ extern "C" {
#endif
/**
+ * @defgroup ScoreThreadQ Thread Queue Handler
+ *
+ * @ingroup Score
+ *
+ * This handler encapsulates functionality related to managing sets of threads
+ * blocked waiting for resources.
+ */
+/**@{*/
+
+/**
* Constant for indefinite wait.
*/
#define THREAD_QUEUE_WAIT_FOREVER WATCHDOG_NO_TIMEOUT
@@ -377,15 +377,11 @@ void _Thread_queue_Process_timeout(
Thread_Control *the_thread
);
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/threadq.inl>
-#endif
+/**@}*/
#ifdef __cplusplus
}
#endif
-/**@}*/
-
#endif
/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/threadq.inl b/cpukit/score/inline/rtems/score/threadq.inl
deleted file mode 100644
index d64638908a..0000000000
--- a/cpukit/score/inline/rtems/score/threadq.inl
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file
- *
- * @brief Inlined Routines Associated with the Manipulation of Thread Queues
- *
- * This inline file contains all of the inlined routines associated with
- * the manipulation of thread queues.
- */
-
-/*
- * COPYRIGHT (c) 1989-2008.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.com/license/LICENSE.
- */
-
-#ifndef _RTEMS_SCORE_THREADQ_H
-# error "Never use <rtems/score/threadq.inl> directly; include <rtems/score/threadq.h> instead."
-#endif
-
-#ifndef _RTEMS_SCORE_THREADQ_INL
-#define _RTEMS_SCORE_THREADQ_INL
-
-#include <rtems/score/thread.h>
-
-/**
- * @addtogroup ScoreThreadQ
- */
-/**@{**/
-
-/** @} */
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 0b21d7c888..7fe0f6137b 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -335,10 +335,6 @@ $(PROJECT_INCLUDE)/rtems/score/object.inl: inline/rtems/score/object.inl $(PROJE
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.inl
-$(PROJECT_INCLUDE)/rtems/score/threadq.inl: inline/rtems/score/threadq.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadq.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadq.inl
-
$(PROJECT_INCLUDE)/rtems/score/tod.inl: inline/rtems/score/tod.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/tod.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/tod.inl