[rtems commit] score: Delete threadq.inl

Sebastian Huber sebh at rtems.org
Fri Jul 26 09:51:53 UTC 2013


Module:    rtems
Branch:    master
Commit:    8d0bf3224b862a0789ecd12ae5ddfb1c7fb6410a
Changeset: http://git.rtems.org/rtems/commit/?id=8d0bf3224b862a0789ecd12ae5ddfb1c7fb6410a

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Jul 24 16:50:27 2013 +0200

score: Delete threadq.inl

---

 cpukit/score/Makefile.am                    |    1 -
 cpukit/score/include/rtems/score/threadq.h  |   26 ++++++++-----------
 cpukit/score/inline/rtems/score/threadq.inl |   36 ---------------------------
 cpukit/score/preinstall.am                  |    4 ---
 4 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index f8333c8..be9dcc2 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 1be3369..3fec379 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 d646389..0000000
--- 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 0b21d7c..7fe0f61 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




More information about the vc mailing list