git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@5861 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 198 insertions, 167 deletions

diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 026b14267..3dcd5ac68 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -100,14 +100,17 @@
 #endif

 /** @} */

 

+/* Forward declaration of the thread structure, it is used in most

+   modules.*/

 typedef struct Thread Thread;

 

+/* Inclusion of all the kernel sub-headers.*/

 #include "chconf.h"

 #include "chtypes.h"

 #include "chdebug.h"

 #include "chcore.h"

 #include "chthreads.h"

-//#include "chlists.h"

+#include "chlists.h"

 #include "chsys.h"

 #include "chvt.h"

 #include "chschd.h"

@@ -123,7 +126,6 @@ typedef struct Thread Thread;
 #include "chmempools.h"

 #include "chdynamic.h"

 #include "chregistry.h"

-#include "chinline.h"

 #include "chqueues.h"

 #include "chstreams.h"

 #include "chfiles.h"

diff --git a/os/kernel/include/chinline.h b/os/kernel/include/chinline.h
deleted file mode 100644
index 46ac45a84..000000000
--- a/os/kernel/include/chinline.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    chinline.h

- * @brief   Kernel inlined functions.

- * @details In this file there are a set of inlined functions if the

- *          @p CH_OPTIMIZE_SPEED is enabled.

- */

-

-#ifndef _CHINLINE_H_

-#define _CHINLINE_H_

-

-/* If the performance code path has been chosen then all the following

-   functions are inlined into the various kernel modules.*/

-#if CH_OPTIMIZE_SPEED

-static INLINE void prio_insert(Thread *tp, ThreadsQueue *tqp) {

-

-  Thread *cp = (Thread *)tqp;

-  do {

-    cp = cp->p_next;

-  } while ((cp != (Thread *)tqp) && (cp->p_prio >= tp->p_prio));

-  tp->p_next = cp;

-  tp->p_prev = cp->p_prev;

-  tp->p_prev->p_next = cp->p_prev = tp;

-}

-

-static INLINE void queue_insert(Thread *tp, ThreadsQueue *tqp) {

-

-  tp->p_next = (Thread *)tqp;

-  tp->p_prev = tqp->p_prev;

-  tp->p_prev->p_next = tqp->p_prev = tp;

-}

-

-static INLINE Thread *fifo_remove(ThreadsQueue *tqp) {

-  Thread *tp = tqp->p_next;

-

-  (tqp->p_next = tp->p_next)->p_prev = (Thread *)tqp;

-  return tp;

-}

-

-static INLINE Thread *lifo_remove(ThreadsQueue *tqp) {

-  Thread *tp = tqp->p_prev;

-

-  (tqp->p_prev = tp->p_prev)->p_next = (Thread *)tqp;

-  return tp;

-}

-

-static INLINE Thread *dequeue(Thread *tp) {

-

-  tp->p_prev->p_next = tp->p_next;

-  tp->p_next->p_prev = tp->p_prev;

-  return tp;

-}

-

-static INLINE void list_insert(Thread *tp, ThreadsList *tlp) {

-

-  tp->p_next = tlp->p_next;

-  tlp->p_next = tp;

-}

-

-static INLINE Thread *list_remove(ThreadsList *tlp) {

-

-  Thread *tp = tlp->p_next;

-  tlp->p_next = tp->p_next;

-  return tp;

-}

-#endif /* CH_OPTIMIZE_SPEED */

-

-#endif /* _CHINLINE_H_ */

diff --git a/os/kernel/include/chlists.h b/os/kernel/include/chlists.h
new file mode 100644
index 000000000..e47f0b704
--- /dev/null
+++ b/os/kernel/include/chlists.h
@@ -0,0 +1,194 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012,2013 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file    chlists.h

+ * @brief   Thread queues/lists inlined code.

+ *

+ * @addtogroup internals

+ * @{

+ */

+

+#ifndef _CHLISTS_H_

+#define _CHLISTS_H_

+

+/*===========================================================================*/

+/* Module constants.                                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module data structures and types.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module macros.                                                            */

+/*===========================================================================*/

+

+/**

+ * @brief   Data part of a static threads queue initializer.

+ * @details This macro should be used when statically initializing a threads

+ *          queue that is part of a bigger structure.

+ *

+ * @param[in] name      the name of the threads queue variable

+ */

+#define _THREADSQUEUE_DATA(name) {(Thread *)&name, (Thread *)&name}

+

+/**

+ * @brief   Static threads queue initializer.

+ * @details Statically initialized threads queues require no explicit

+ *          initialization using @p queue_init().

+ *

+ * @param[in] name      the name of the threads queue variable

+ */

+#define THREADSQUEUE_DECL(name) ThreadsQueue name = _THREADSQUEUE_DATA(name)

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module inline functions.                                                  */

+/*===========================================================================*/

+

+/**

+ * @brief   Threads list initialization.

+ *

+ * @notapi

+ */

+static inline void list_init(ThreadsList *tlp) {

+

+  tlp->p_next = (Thread *)tlp;

+}

+

+/**

+ * @brief   Evaluates to @p TRUE if the specified threads list is empty.

+ *

+ * @notapi

+ */

+static inline bool_t list_isempty(ThreadsList *tlp) {

+

+  return (bool_t)(tlp->p_next == (Thread *)tlp);

+}

+

+/**

+ * @brief   Evaluates to @p TRUE if the specified threads list is not empty.

+ *

+ * @notapi

+ */

+static inline bool_t list_notempty(ThreadsList *tlp) {

+

+  return (bool_t)(tlp->p_next != (Thread *)tlp);

+}

+

+/**

+ * @brief   Threads queue initialization.

+ *

+ * @notapi

+ */

+static inline void queue_init(ThreadsQueue *tqp) {

+

+  tqp->p_next = tqp->p_prev = (Thread *)tqp;

+}

+

+/**

+ * @brief   Evaluates to @p TRUE if the specified threads queue is empty.

+ *

+ * @notapi

+ */

+static inline bool_t queue_isempty(ThreadsQueue *tqp) {

+

+  return (bool_t)(tqp->p_next == (Thread *)tqp);

+}

+

+/**

+ * @brief   Evaluates to @p TRUE if the specified threads queue is not empty.

+ *

+ * @notapi

+ */

+static inline bool_t queue_notempty(ThreadsQueue *tqp) {

+

+  return (bool_t)(tqp->p_next != (Thread *)tqp);

+}

+

+/* If the performance code path has been chosen then all the following

+   functions are inlined into the various kernel modules.*/

+#if CH_OPTIMIZE_SPEED

+static inline void list_insert(Thread *tp, ThreadsList *tlp) {

+

+  tp->p_next = tlp->p_next;

+  tlp->p_next = tp;

+}

+

+static inline Thread *list_remove(ThreadsList *tlp) {

+

+  Thread *tp = tlp->p_next;

+  tlp->p_next = tp->p_next;

+  return tp;

+}

+

+static inline void queue_prio_insert(Thread *tp, ThreadsQueue *tqp) {

+

+  Thread *cp = (Thread *)tqp;

+  do {

+    cp = cp->p_next;

+  } while ((cp != (Thread *)tqp) && (cp->p_prio >= tp->p_prio));

+  tp->p_next = cp;

+  tp->p_prev = cp->p_prev;

+  tp->p_prev->p_next = cp->p_prev = tp;

+}

+

+static inline void queue_insert(Thread *tp, ThreadsQueue *tqp) {

+

+  tp->p_next = (Thread *)tqp;

+  tp->p_prev = tqp->p_prev;

+  tp->p_prev->p_next = tqp->p_prev = tp;

+}

+

+static inline Thread *queue_fifo_remove(ThreadsQueue *tqp) {

+  Thread *tp = tqp->p_next;

+

+  (tqp->p_next = tp->p_next)->p_prev = (Thread *)tqp;

+  return tp;

+}

+

+static inline Thread *queue_lifo_remove(ThreadsQueue *tqp) {

+  Thread *tp = tqp->p_prev;

+

+  (tqp->p_prev = tp->p_prev)->p_next = (Thread *)tqp;

+  return tp;

+}

+

+static inline Thread *queue_dequeue(Thread *tp) {

+

+  tp->p_prev->p_next = tp->p_next;

+  tp->p_next->p_prev = tp->p_prev;

+  return tp;

+}

+#endif /* CH_OPTIMIZE_SPEED */

+

+#endif /* _CHLISTS_H_ */

diff --git a/os/kernel/include/chthreads.h b/os/kernel/include/chthreads.h
index 1341cb1ea..854a72dde 100644
--- a/os/kernel/include/chthreads.h
+++ b/os/kernel/include/chthreads.h
@@ -265,24 +265,6 @@ typedef msg_t (*tfunc_t)(void *);
 /* Module macros.                                                            */

 /*===========================================================================*/

 

-/**

- * @brief   Data part of a static threads queue initializer.

- * @details This macro should be used when statically initializing a threads

- *          queue that is part of a bigger structure.

- *

- * @param[in] name      the name of the threads queue variable

- */

-#define _THREADSQUEUE_DATA(name) {(Thread *)&name, (Thread *)&name}

-

-/**

- * @brief   Static threads queue initializer.

- * @details Statically initialized threads queues require no explicit

- *          initialization using @p queue_init().

- *

- * @param[in] name      the name of the threads queue variable

- */

-#define THREADSQUEUE_DECL(name) ThreadsQueue name = _THREADSQUEUE_DATA(name)

-

 /*===========================================================================*/

 /* External declarations.                                                    */

 /*===========================================================================*/

@@ -437,66 +419,6 @@ extern "C" {
 /* Module inline functions.                                                  */

 /*===========================================================================*/

 

-/**

- * @brief   Threads list initialization.

- *

- * @notapi

- */

-static inline void list_init(ThreadsList *tlp) {

-

-  tlp->p_next = (Thread *)tlp;

-}

-

-/**

- * @brief   Evaluates to @p TRUE if the specified threads list is empty.

- *

- * @notapi

- */

-static inline bool_t list_isempty(ThreadsList *tlp) {

-

-  return (bool_t)(tlp->p_next == (Thread *)tlp);

-}

-

-/**

- * @brief   Evaluates to @p TRUE if the specified threads list is not empty.

- *

- * @notapi

- */

-static inline bool_t list_notempty(ThreadsList *tlp) {

-

-  return (bool_t)(tlp->p_next != (Thread *)tlp);

-}

-

-/**

- * @brief   Threads queue initialization.

- *

- * @notapi

- */

-static inline void queue_init(ThreadsQueue *tqp) {

-

-  tqp->p_next = tqp->p_prev = (Thread *)tqp;

-}

-

-/**

- * @brief   Evaluates to @p TRUE if the specified threads queue is empty.

- *

- * @notapi

- */

-static inline bool_t queue_isempty(ThreadsQueue *tqp) {

-

-  return (bool_t)(tqp->p_next == (Thread *)tqp);

-}

-

-/**

- * @brief   Evaluates to @p TRUE if the specified threads queue is not empty.

- *

- * @notapi

- */

-static inline bool_t queue_notempty(ThreadsQueue *tqp) {

-

-  return (bool_t)(tqp->p_next != (Thread *)tqp);

-}

-

 #endif /* _CHTHREADS_H_ */

 

 /** @} */