aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/ch.cpp22
-rw-r--r--src/lib/ch.hpp20
-rw-r--r--test/test.c18
-rw-r--r--test/testcond.c2
-rw-r--r--test/testdyn.c6
-rw-r--r--test/testevt.c2
-rw-r--r--test/testheap.c2
-rw-r--r--test/testmtx.c2
-rw-r--r--test/testpools.c2
-rw-r--r--test/testsem.c2
10 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/ch.cpp b/src/lib/ch.cpp
index aaf357693..5663955cb 100644
--- a/src/lib/ch.cpp
+++ b/src/lib/ch.cpp
@@ -86,7 +86,7 @@ namespace chibios_rt {
chThdExit(msg);
}
-#ifdef CH_USE_WAITEXIT
+#if CH_USE_WAITEXIT
msg_t BaseThread::Wait(void) {
return chThdWait(thread_ref);
@@ -103,7 +103,7 @@ namespace chibios_rt {
chThdResume(thread_ref);
}
-#ifdef CH_USE_TERMINATE
+#if CH_USE_TERMINATE
void BaseThread::Terminate(void) {
chThdTerminate(thread_ref);
@@ -120,7 +120,7 @@ namespace chibios_rt {
chThdSleepUntil(time);
}
-#ifdef CH_USE_MESSAGES
+#if CH_USE_MESSAGES
msg_t BaseThread::SendMessage(::Thread* tp, msg_t msg) {
return chMsgSend(tp, msg);
@@ -157,7 +157,7 @@ namespace chibios_rt {
return 0;
}
-#ifdef CH_USE_SEMAPHORES
+#if CH_USE_SEMAPHORES
/*------------------------------------------------------------------------*
* chibios_rt::Semaphore *
*------------------------------------------------------------------------*/
@@ -176,7 +176,7 @@ namespace chibios_rt {
return chSemWait(&sem);
}
-#ifdef CH_USE_SEMAPHORES_TIMEOUT
+#if CH_USE_SEMAPHORES_TIMEOUT
msg_t Semaphore::WaitTimeout(systime_t time) {
return chSemWaitTimeout(&sem, time);
@@ -188,7 +188,7 @@ namespace chibios_rt {
chSemSignal(&sem);
}
-#ifdef CH_USE_SEMSW
+#if CH_USE_SEMSW
msg_t Semaphore::SignalWait(Semaphore *ssem, Semaphore *wsem) {
return chSemSignalWait(&ssem->sem, &wsem->sem);
@@ -196,7 +196,7 @@ namespace chibios_rt {
#endif /* CH_USE_SEMSW */
#endif /* CH_USE_SEMAPHORES */
-#ifdef CH_USE_MUTEXES
+#if CH_USE_MUTEXES
/*------------------------------------------------------------------------*
* chibios_rt::Mutex *
*------------------------------------------------------------------------*/
@@ -225,7 +225,7 @@ namespace chibios_rt {
chMtxUnlockAll();
}
-#ifdef CH_USE_CONDVARS
+#if CH_USE_CONDVARS
/*------------------------------------------------------------------------*
* chibios_rt::CondVar *
*------------------------------------------------------------------------*/
@@ -249,7 +249,7 @@ namespace chibios_rt {
return chCondWait(&condvar);
}
-#ifdef CH_USE_CONDVARS_TIMEOUT
+#if CH_USE_CONDVARS_TIMEOUT
msg_t CondVar::WaitTimeout(systime_t time) {
return chCondWaitTimeout(&condvar, time);
@@ -258,7 +258,7 @@ namespace chibios_rt {
#endif /* CH_USE_CONDVARS */
#endif /* CH_USE_MUTEXES */
-#ifdef CH_USE_EVENTS
+#if CH_USE_EVENTS
/*------------------------------------------------------------------------*
* chibios_rt::Event *
*------------------------------------------------------------------------*/
@@ -317,7 +317,7 @@ namespace chibios_rt {
return chEvtWaitAll(ewmask);
}
-#ifdef CH_USE_EVENTS_TIMEOUT
+#if CH_USE_EVENTS_TIMEOUT
eventmask_t Event::WaitOneTimeout(eventmask_t ewmask, systime_t time) {
return chEvtWaitOneTimeout(ewmask, time);
diff --git a/src/lib/ch.hpp b/src/lib/ch.hpp
index 66db61dd1..bd1561689 100644
--- a/src/lib/ch.hpp
+++ b/src/lib/ch.hpp
@@ -135,7 +135,7 @@ namespace chibios_rt {
*/
static void Exit(msg_t msg);
-#ifdef CH_USE_WAITEXIT
+#if CH_USE_WAITEXIT
/**
* @brief Synchronization on Thread exit.
*
@@ -179,7 +179,7 @@ namespace chibios_rt {
*/
static void SleepUntil(systime_t time);
-#ifdef CH_USE_MESSAGES
+#if CH_USE_MESSAGES
/**
* @brief Sends a message to the thread and returns the answer.
*
@@ -281,7 +281,7 @@ namespace chibios_rt {
}
};
-#ifdef CH_USE_SEMAPHORES
+#if CH_USE_SEMAPHORES
/**
* @brief Class encapsulating a semaphore.
*/
@@ -315,7 +315,7 @@ namespace chibios_rt {
*/
msg_t Wait(void);
-#ifdef CH_USE_SEMAPHORES_TIMEOUT
+#if CH_USE_SEMAPHORES_TIMEOUT
/**
* @brief Wait operation on the semaphore with timeout.
*
@@ -335,7 +335,7 @@ namespace chibios_rt {
*/
void Signal(void);
-#ifdef CH_USE_SEMSW
+#if CH_USE_SEMSW
/**
* @brief Atomic signal and wait operations.
*
@@ -349,7 +349,7 @@ namespace chibios_rt {
};
#endif /* CH_USE_SEMAPHORES */
-#ifdef CH_USE_MUTEXES
+#if CH_USE_MUTEXES
/**
* @brief Class encapsulating a mutex.
*/
@@ -398,7 +398,7 @@ namespace chibios_rt {
static void UnlockAll(void);
};
-#ifdef CH_USE_CONDVARS
+#if CH_USE_CONDVARS
/**
* @brief Class encapsulating a conditional variable.
*/
@@ -436,7 +436,7 @@ namespace chibios_rt {
*/
msg_t Wait(void);
-#ifdef CH_USE_CONDVARS_TIMEOUT
+#if CH_USE_CONDVARS_TIMEOUT
/**
* @brief Waits on the CondVar while releasing the controlling mutex.
*
@@ -453,7 +453,7 @@ namespace chibios_rt {
#endif /* CH_USE_CONDVARS */
#endif /* CH_USE_MUTEXES */
-#ifdef CH_USE_EVENTS
+#if CH_USE_EVENTS
/**
* @brief Class encapsulating an event source.
*/
@@ -567,7 +567,7 @@ namespace chibios_rt {
*/
static eventmask_t WaitAll(eventmask_t ewmask);
-#ifdef CH_USE_EVENTS_TIMEOUT
+#if CH_USE_EVENTS_TIMEOUT
/**
* @brief Waits for a single event.
* @details A pending event among those specified in @p ewmask is selected,
diff --git a/test/test.c b/test/test.c
index 83be7410a..5300bce88 100644
--- a/test/test.c
+++ b/test/test.c
@@ -37,35 +37,35 @@
static const struct testcase *tests[] = {
&testrdy1,
&testrdy2,
-#ifdef CH_USE_SEMAPHORES
+#if CH_USE_SEMAPHORES
&testsem1,
&testsem2,
#endif
-#ifdef CH_USE_MUTEXES
+#if CH_USE_MUTEXES
&testmtx1,
&testmtx2,
&testmtx3,
-#ifdef CH_USE_CONDVARS
+#if CH_USE_CONDVARS
&testcond1,
&testcond2,
#endif
#endif
-#ifdef CH_USE_MESSAGES
+#if CH_USE_MESSAGES
&testmsg1,
#endif
-#ifdef CH_USE_EVENTS
+#if CH_USE_EVENTS
&testevt1,
#endif
-#ifdef CH_USE_HEAP
+#if CH_USE_HEAP
&testheap1,
#endif
-#ifdef CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS
&testpools1,
#endif
-#if defined(CH_USE_DYNAMIC) && defined(CH_USE_HEAP)
+#if CH_USE_DYNAMIC && CH_USE_HEAP
&testdyn1,
#endif
-#if defined(CH_USE_DYNAMIC) && defined(CH_USE_MEMPOOLS)
+#if CH_USE_DYNAMIC && CH_USE_MEMPOOLS
&testdyn2,
#endif
&testbmk1,
diff --git a/test/testcond.c b/test/testcond.c
index cbc304270..f6f390044 100644
--- a/test/testcond.c
+++ b/test/testcond.c
@@ -21,7 +21,7 @@
#include "test.h"
-#if defined(CH_USE_CONDVARS) && defined(CH_USE_MUTEXES)
+#if CH_USE_CONDVARS && CH_USE_MUTEXES
static Mutex m1;
static CondVar c1;
diff --git a/test/testdyn.c b/test/testdyn.c
index 37b6b9bc4..f59cdaa14 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -21,7 +21,7 @@
#include "test.h"
-#ifdef CH_USE_DYNAMIC
+#if CH_USE_DYNAMIC
static msg_t thread(void *p) {
@@ -29,7 +29,7 @@ static msg_t thread(void *p) {
return 0;
}
-#ifdef CH_USE_HEAP
+#if CH_USE_HEAP
static char *dyn1_gettest(void) {
return "Dynamic APIs, threads creation from heap";
@@ -78,7 +78,7 @@ const struct testcase testdyn1 = {
};
#endif /* CH_USE_HEAP */
-#ifdef CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS
static MemoryPool mp1;
static char *dyn2_gettest(void) {
diff --git a/test/testevt.c b/test/testevt.c
index 28e54cbf6..706953dd6 100644
--- a/test/testevt.c
+++ b/test/testevt.c
@@ -21,7 +21,7 @@
#include "test.h"
-#ifdef CH_USE_EVENTS
+#if CH_USE_EVENTS
#define ALLOWED_DELAY MS2ST(5)
diff --git a/test/testheap.c b/test/testheap.c
index b6468b6be..e9907baba 100644
--- a/test/testheap.c
+++ b/test/testheap.c
@@ -21,7 +21,7 @@
#include "test.h"
-#ifdef CH_USE_HEAP
+#if CH_USE_HEAP
#define SIZE 16
diff --git a/test/testmtx.c b/test/testmtx.c
index 52c756436..7675f3f7c 100644
--- a/test/testmtx.c
+++ b/test/testmtx.c
@@ -21,7 +21,7 @@
#include "test.h"
-#ifdef CH_USE_MUTEXES
+#if CH_USE_MUTEXES
#define ALLOWED_DELAY 5
diff --git a/test/testpools.c b/test/testpools.c
index d3f451c73..2165c39d1 100644
--- a/test/testpools.c
+++ b/test/testpools.c
@@ -21,7 +21,7 @@
#include "test.h"
-#ifdef CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS
static MemoryPool mp1;
diff --git a/test/testsem.c b/test/testsem.c
index 1ec0a7a13..c16bb0e68 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -21,7 +21,7 @@
#include "test.h"
-#ifdef CH_USE_SEMAPHORES
+#if CH_USE_SEMAPHORES
#define ALLOWED_DELAY MS2ST(5)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 12:36:31 +0000