From cf204e72ea5fd6e4be8b3295cb148fde5fdd47d2 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 16 Feb 2016 10:07:00 +0000 Subject: Tree reorganization. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8900 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- test/nil/test_root.c | 4 ++-- test/nil/test_root.h | 2 +- test/nil/test_sequence_002.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test/nil') diff --git a/test/nil/test_root.c b/test/nil/test_root.c index 12ae7ef52..4ea4458b2 100644 --- a/test/nil/test_root.c +++ b/test/nil/test_root.c @@ -51,7 +51,7 @@ thread_reference_t gtr1; */ THD_WORKING_AREA(wa_test_support, 128); THD_FUNCTION(test_support, arg) { -#if NIL_CFG_USE_EVENTS == TRUE +#if CH_CFG_USE_EVENTS == TRUE thread_t *tp = (thread_t *)arg; #else (void)arg; @@ -68,7 +68,7 @@ THD_FUNCTION(test_support, arg) { chSemSignalI(&gsem1); chSemResetI(&gsem2, 0); chThdResumeI(>r1, MSG_OK); -#if NIL_CFG_USE_EVENTS == TRUE +#if CH_CFG_USE_EVENTS == TRUE chEvtSignalI(tp, 0x55); #endif chSchRescheduleS(); diff --git a/test/nil/test_root.h b/test/nil/test_root.h index 34f776494..c51899359 100644 --- a/test/nil/test_root.h +++ b/test/nil/test_root.h @@ -25,7 +25,7 @@ #ifndef _TEST_ROOT_H_ #define _TEST_ROOT_H_ -#include "nil.h" +#include "ch.h" #include "test_sequence_001.h" #include "test_sequence_002.h" diff --git a/test/nil/test_sequence_002.c b/test/nil/test_sequence_002.c index 7b1d41d64..486d2e441 100644 --- a/test/nil/test_sequence_002.c +++ b/test/nil/test_sequence_002.c @@ -327,7 +327,7 @@ static const testcase_t test_002_004 = { }; #endif /* TRUE */ -#if (NIL_CFG_USE_EVENTS == TRUE) || defined(__DOXYGEN__) +#if (CH_CFG_USE_EVENTS == TRUE) || defined(__DOXYGEN__) /** * @page test_002_005 Events functionality * @@ -408,7 +408,7 @@ static const testcase_t test_002_005 = { NULL, test_002_005_execute }; -#endif /* NIL_CFG_USE_EVENTS == TRUE */ +#endif /* CH_CFG_USE_EVENTS == TRUE */ /**************************************************************************** * Exported data. @@ -430,7 +430,7 @@ const testcase_t * const test_sequence_002[] = { #if TRUE || defined(__DOXYGEN__) &test_002_004, #endif -#if (NIL_CFG_USE_EVENTS == TRUE) || defined(__DOXYGEN__) +#if (CH_CFG_USE_EVENTS == TRUE) || defined(__DOXYGEN__) &test_002_005, #endif NULL -- cgit v1.2.3