diff options
Diffstat (limited to 'test/rt/testdyn.c')
| -rw-r--r-- | test/rt/testdyn.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/rt/testdyn.c b/test/rt/testdyn.c index 8dd6d5bf2..7a6cdfb20 100644 --- a/test/rt/testdyn.c +++ b/test/rt/testdyn.c @@ -50,7 +50,7 @@ */
#if CH_CFG_USE_DYNAMIC || defined(__DOXYGEN__)
-#if (CH_CFG_USE_HEAP && !CH_CFG_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
+#if CH_CFG_USE_HEAP || defined(__DOXYGEN__)
static memory_heap_t heap1;
#endif
#if CH_CFG_USE_MEMPOOLS || defined(__DOXYGEN__)
@@ -73,7 +73,7 @@ static THD_FUNCTION(thread, p) { test_emit_token(*(char *)p);
}
-#if (CH_CFG_USE_HEAP && !CH_CFG_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
+#if CH_CFG_USE_HEAP || defined(__DOXYGEN__)
static void dyn1_setup(void) {
chHeapObjectInit(&heap1, test.buffer, sizeof(union test_buffers));
@@ -180,8 +180,7 @@ ROMCONST struct testcase testdyn2 = { };
#endif /* CH_CFG_USE_MEMPOOLS */
-#if (CH_CFG_USE_HEAP && !CH_CFG_USE_MALLOC_HEAP && CH_CFG_USE_REGISTRY) || \
- defined(__DOXYGEN__)
+#if (CH_CFG_USE_HEAP && CH_CFG_USE_REGISTRY) || defined(__DOXYGEN__)
/**
* @page test_dynamic_003 Registry and References test
*
@@ -251,14 +250,13 @@ ROMCONST struct testcase testdyn3 = { */
ROMCONST struct testcase * ROMCONST patterndyn[] = {
#if CH_CFG_USE_DYNAMIC || defined(__DOXYGEN__)
-#if (CH_CFG_USE_HEAP && !CH_CFG_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
+#if CH_CFG_USE_HEAP || defined(__DOXYGEN__)
&testdyn1,
#endif
#if CH_CFG_USE_MEMPOOLS || defined(__DOXYGEN__)
&testdyn2,
#endif
-#if (CH_CFG_USE_HEAP && !CH_CFG_USE_MALLOC_HEAP && CH_CFG_USE_REGISTRY) || \
- defined(__DOXYGEN__)
+#if (CH_CFG_USE_HEAP && CH_CFG_USE_REGISTRY) || defined(__DOXYGEN__)
&testdyn3,
#endif
#endif
|