From 59b727e66f1a79f368b2ab9e3d18205188a97061 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 30 Jan 2010 10:14:30 +0000
Subject: [PATCH] Fixed bug 2942757.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1552 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/include/threads.h  | 3 +++
 os/kernel/templates/chconf.h | 1 +
 readme.txt                   | 2 ++
 todo.txt                     | 8 ++++----
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/os/kernel/include/threads.h b/os/kernel/include/threads.h
index 6c674dea7..f94beac32 100644
--- a/os/kernel/include/threads.h
+++ b/os/kernel/include/threads.h
@@ -33,6 +33,9 @@
 #if CH_USE_DYNAMIC && !CH_USE_WAITEXIT
 #error "CH_USE_DYNAMIC requires CH_USE_WAITEXIT"
 #endif
+#if CH_USE_DYNAMIC && !CH_USE_HEAP && !CH_USE_MEMPOOLS
+#error "CH_USE_DYNAMIC requires CH_USE_HEAP and/or CH_USE_MEMPOOLS"
+#endif
 
 /**
  * @brief Structure representing a thread.
diff --git a/os/kernel/templates/chconf.h b/os/kernel/templates/chconf.h
index 5b42d3c9c..7fc7ea82b 100644
--- a/os/kernel/templates/chconf.h
+++ b/os/kernel/templates/chconf.h
@@ -329,6 +329,7 @@
  *
  * @note The default is @p TRUE.
  * @note Requires @p CH_USE_WAITEXIT.
+ * @note Requires @p CH_USE_HEAP and/or @p CH_USE_MEMPOOLS.
  */
 #if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
 #define CH_USE_DYNAMIC                  TRUE
diff --git a/readme.txt b/readme.txt
index 142aff2ca..9c17eeeb5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -52,6 +52,8 @@
 *****************************************************************************
 
 *** 1.5.0 ***
+- FIX: Fixed missing dependencies check for CH_USE_DYNAMIC (bug 2942757)
+  (backported in 1.4.1).
 - FIX: Fixed swapped thread states descriptions (bug 2938445)(backported in
   1.4.1).
 - FIX_ Fixed C99-style variable declaration (bug 2938444)(backported in 1.4.1).
diff --git a/todo.txt b/todo.txt
index 5c16aeeb8..2733b634e 100644
--- a/todo.txt
+++ b/todo.txt
@@ -6,6 +6,8 @@ X = In progress, some work done.
 
 Before 1.6.0:
 * Remove instances of unnamed structures/unions.
+- Reference counter for threads, concept of detached threads, threads
+  management.
 - Active threads registry in the kernel.
 - Debug-related features and tools.
 - I2C device driver class support.
@@ -14,17 +16,15 @@ Before 1.6.0:
   require changes to lwIP or a new TCP/IP stack however.
 - More code examples into the documentation.
 - Update C++ wrapper (Heap, Pools, Mailboxes and any new feature).
-- Threads Pools manager in the library.
-? OSEK-style simple tasks within the idle thread.
 
 After 1.6.0
 ? Minimal optional C-runtime library (complete enough for lwIP).
 ? Think to something for threads restart.
+? OSEK-style simple tasks within the idle thread.
+- Threads Pools manager in the library.
 
 Ideas for 2.x.x:
 - High resolution timers and tickless kernel.
-- Reference counter for threads, concept of detached threads, threads
-  management.
 
 Ideas for 3.x.x:
 - Multicore support.