Removed the CH_USE_SEMAPHORES_TIMEOUT configuration option.

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

4 files changed, 3 insertions, 22 deletions

diff --git a/test/coverage/chconf.h b/test/coverage/chconf.h
index e739fa365..88528e834 100644
--- a/test/coverage/chconf.h
+++ b/test/coverage/chconf.h
@@ -154,16 +154,6 @@
 #endif

 

 /**

- * If specified then the Semaphores with timeout APIs are included in the

- * kernel.

- * @note The default is @p TRUE.

- * @note Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_SEMAPHORES_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_TIMEOUT       TRUE

-#endif

-

-/**

  * If specified then the Mutexes APIs are included in the kernel.

  * @note The default is @p TRUE.

  */

diff --git a/test/testmbox.c b/test/testmbox.c
index 92897b1dc..2403afce6 100644
--- a/test/testmbox.c
+++ b/test/testmbox.c
@@ -37,7 +37,6 @@
  * <h2>Preconditions</h2>

  * The module requires the following kernel options:

  * - @p CH_USE_MAILBOXES

- * - @p CH_USE_SEMAPHORES_TIMEOUT

  * .

  * In case some of the required options are not enabled then some or all tests

  * may be skipped.

@@ -51,7 +50,7 @@
  * @brief Mailboxes header file

  */

 

-#if CH_USE_MAILBOXES && CH_USE_SEMAPHORES_TIMEOUT

+#if CH_USE_MAILBOXES

 

 #define ALLOWED_DELAY MS2ST(5)

 #define MB_SIZE 5

@@ -164,13 +163,13 @@ const struct testcase testmbox1 = {
   mbox1_execute

 };

 

-#endif /* CH_USE_MAILBOXES && CH_USE_SEMAPHORES_TIMEOUT */

+#endif /* CH_USE_MAILBOXES */

 

 /*

  * Test sequence for mailboxes pattern.

  */

 const struct testcase * const patternmbox[] = {

-#if CH_USE_MAILBOXES && CH_USE_SEMAPHORES_TIMEOUT

+#if CH_USE_MAILBOXES

   &testmbox1,

 #endif

   NULL

diff --git a/test/testqueues.c b/test/testqueues.c
index be8d6fc62..6c460becf 100644
--- a/test/testqueues.c
+++ b/test/testqueues.c
@@ -108,10 +108,8 @@ static void queues1_execute(void) {
   chIQResetI(&iq);

   test_assert(8, chIQIsEmpty(&iq), "still full");

 

-#if CH_USE_SEMAPHORES_TIMEOUT

   /* Timeout */

   test_assert(9, chIQGetTimeout(&iq, 10) == Q_TIMEOUT, "wrong timeout return");

-#endif

 }

 

 const struct testcase testqueues1 = {

@@ -165,13 +163,11 @@ static void queues2_execute(void) {
   chOQResetI(&oq);

   test_assert(8, chOQIsEmpty(&oq), "still full");

 

-#if CH_USE_SEMAPHORES_TIMEOUT

   /* Timeout */

   for (i = 0; i < TEST_QUEUES_SIZE; i++)

     chOQPut(&oq, 'A' + i);

   test_assert(9, chOQIsFull(&oq), "still has space");

   test_assert(10, chOQPutTimeout(&oq, 0, 10) == Q_TIMEOUT, "wrong timeout return");

-#endif

 }

 

 const struct testcase testqueues2 = {

diff --git a/test/testsem.c b/test/testsem.c
index a0f94dcb0..9471de643 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -71,7 +71,6 @@ const struct testcase testsem1 = {
   sem1_execute

 };

 

-#if CH_USE_SEMAPHORES_TIMEOUT

 static char *sem2_gettest(void) {

 

   return "Semaphores, timeout test";

@@ -138,7 +137,6 @@ const struct testcase testsem2 = {
   NULL,

   sem2_execute

 };

-#endif /* CH_USE_SEMAPHORES_TIMEOUT */

 

 #if CH_USE_SEMSW

 static char *sem3_gettest(void) {

@@ -185,9 +183,7 @@ const struct testcase testsem3 = {
 const struct testcase * const patternsem[] = {

 #if CH_USE_SEMAPHORES

   &testsem1,

-#if CH_USE_SEMAPHORES_TIMEOUT

   &testsem2,

-#endif

 #if CH_USE_SEMSW

   &testsem3,

 #endif