From e7e79a6ccb4f3e320b2b8b7bad1b14d65218641d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 18 Mar 2011 18:38:08 +0000
Subject: License updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2827 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 test/testdyn.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test/testdyn.c')

diff --git a/test/testdyn.c b/test/testdyn.c
index 2035224a1..c5b523816 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
-- 
cgit v1.2.3


From 506212845dd0644b2755191da1252380aababd24 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 23 Mar 2011 13:12:41 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2839
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 test/testdyn.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/testdyn.c')

diff --git a/test/testdyn.c b/test/testdyn.c
index c5b523816..5657a8dc2 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -53,11 +53,11 @@
  * @brief Dynamic thread APIs test header file
  */
 
-#if CH_USE_DYNAMIC
-#if CH_USE_HEAP
+#if CH_USE_DYNAMIC || defined(__DOXYGEN__)
+#if CH_USE_HEAP || defined(__DOXYGEN__)
 static MemoryHeap heap1;
 #endif
-#if CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS || defined(__DOXYGEN__)
 static MemoryPool mp1;
 #endif
 
@@ -78,7 +78,7 @@ static msg_t thread(void *p) {
   return 0;
 }
 
-#if CH_USE_HEAP
+#if CH_USE_HEAP || defined(__DOXYGEN__)
 static void dyn1_setup(void) {
 
   chHeapInit(&heap1, test.buffer, sizeof(union test_buffers));
@@ -126,7 +126,7 @@ ROMCONST struct testcase testdyn1 = {
 };
 #endif /* CH_USE_HEAP */
 
-#if CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS || defined(__DOXYGEN__)
 /**
  * @page test_dynamic_002 Threads creation from Memory Pool
  *
@@ -182,7 +182,7 @@ ROMCONST struct testcase testdyn2 = {
 };
 #endif /* CH_USE_MEMPOOLS */
 
-#if CH_USE_HEAP && CH_USE_REGISTRY
+#if (CH_USE_HEAP && CH_USE_REGISTRY) || defined(__DOXYGEN__)
 /**
  * @page test_dynamic_003 Registry and References test
  *
@@ -251,14 +251,14 @@ ROMCONST struct testcase testdyn3 = {
  * @brief   Test sequence for dynamic APIs.
  */
 ROMCONST struct testcase * ROMCONST patterndyn[] = {
-#if CH_USE_DYNAMIC
-#if CH_USE_HEAP
+#if CH_USE_DYNAMIC || defined(__DOXYGEN__)
+#if CH_USE_HEAP || defined(__DOXYGEN__)
   &testdyn1,
 #endif
-#if CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS || defined(__DOXYGEN__)
   &testdyn2,
 #endif
-#if CH_USE_HEAP && CH_USE_REGISTRY
+#if (CH_USE_HEAP && CH_USE_REGISTRY) || defined(__DOXYGEN__)
   &testdyn3,
 #endif
 #endif
-- 
cgit v1.2.3


From 5e1249af266c9688ec575e5a2f14ecfe6084de49 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 19 May 2011 09:13:24 +0000
Subject: Fixed bug 3303841.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2973 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 test/testdyn.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'test/testdyn.c')

diff --git a/test/testdyn.c b/test/testdyn.c
index 5657a8dc2..d015e2ac6 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -54,7 +54,7 @@
  */
 
 #if CH_USE_DYNAMIC || defined(__DOXYGEN__)
-#if CH_USE_HEAP || defined(__DOXYGEN__)
+#if (CH_USE_HEAP && !CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
 static MemoryHeap heap1;
 #endif
 #if CH_USE_MEMPOOLS || defined(__DOXYGEN__)
@@ -78,7 +78,7 @@ static msg_t thread(void *p) {
   return 0;
 }
 
-#if CH_USE_HEAP || defined(__DOXYGEN__)
+#if (CH_USE_HEAP && !CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
 static void dyn1_setup(void) {
 
   chHeapInit(&heap1, test.buffer, sizeof(union test_buffers));
@@ -124,7 +124,7 @@ ROMCONST struct testcase testdyn1 = {
   NULL,
   dyn1_execute
 };
-#endif /* CH_USE_HEAP */
+#endif /* (CH_USE_HEAP && !CH_USE_MALLOC_HEAP) */
 
 #if CH_USE_MEMPOOLS || defined(__DOXYGEN__)
 /**
@@ -182,7 +182,8 @@ ROMCONST struct testcase testdyn2 = {
 };
 #endif /* CH_USE_MEMPOOLS */
 
-#if (CH_USE_HEAP && CH_USE_REGISTRY) || defined(__DOXYGEN__)
+#if (CH_USE_HEAP && !CH_USE_MALLOC_HEAP && CH_USE_REGISTRY) ||              \
+    defined(__DOXYGEN__)
 /**
  * @page test_dynamic_003 Registry and References test
  *
@@ -252,13 +253,14 @@ ROMCONST struct testcase testdyn3 = {
  */
 ROMCONST struct testcase * ROMCONST patterndyn[] = {
 #if CH_USE_DYNAMIC || defined(__DOXYGEN__)
-#if CH_USE_HEAP || defined(__DOXYGEN__)
+#if (CH_USE_HEAP && !CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
   &testdyn1,
 #endif
 #if CH_USE_MEMPOOLS || defined(__DOXYGEN__)
   &testdyn2,
 #endif
-#if (CH_USE_HEAP && CH_USE_REGISTRY) || defined(__DOXYGEN__)
+#if (CH_USE_HEAP && !CH_USE_MALLOC_HEAP && CH_USE_REGISTRY) ||              \
+    defined(__DOXYGEN__)
   &testdyn3,
 #endif
 #endif
-- 
cgit v1.2.3