4 files changed, 0 insertions, 35 deletions
diff --git a/src/chsleep.c b/src/chsleep.c
index 7f9f161f1..1fc686120 100644
--- a/src/chsleep.c
+++ b/src/chsleep.c
@@ -24,7 +24,6 @@
 
 #include <ch.h>
 
-#ifdef CH_USE_SLEEP
 /**
  * Suspends the invoking thread for the specified time.
  * @param time the system ticks number
@@ -32,12 +31,9 @@
 void chThdSleep(systime_t time) {
 
   chSysLock();
-
   chSchGoSleepTimeoutS(PRSLEEP, time);
-
   chSysUnlock();
 }
-#endif /* CH_USE_SLEEP */
 
 #ifdef CH_USE_SYSTEMTIME
 /**
diff --git a/src/chthreads.c b/src/chthreads.c
index e95abbe73..2069fe389 100644
--- a/src/chthreads.c
+++ b/src/chthreads.c
@@ -204,7 +204,6 @@ void chThdResume(Thread *tp) {
   chSysUnlock();
 }
 
-#ifdef CH_USE_TERMINATE
 /**
  * Requests a thread termination.
  * @param tp the pointer to the thread
@@ -215,12 +214,9 @@ void chThdResume(Thread *tp) {
 void chThdTerminate(Thread *tp) {
 
   chSysLock();
-
   tp->p_flags |= P_TERMINATE;
-
   chSysUnlock();
 }
-#endif
 
 /**
  * Terminates the current thread by specifying an exit status code.
diff --git a/src/include/threads.h b/src/include/threads.h
index b74ba60b4..89acd9add 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -135,14 +135,10 @@ struct Thread {
 /** Thread state: After termination.*/
 #define PREXIT      10
 
-#ifdef CH_USE_TERMINATE
 /** Thread option: Termination requested flag.*/
 #define P_TERMINATE 1
-#endif
-#ifdef CH_USE_RESUME
 /** Thread option: Create suspended thread.*/
 #define P_SUSPENDED 2
-#endif
 #ifdef CH_USE_MESSAGES_PRIORITY
 /** Thread option: Serve messages by priority instead of FIFO order.*/
 #define P_MSGBYPRIO 4
@@ -179,15 +175,9 @@ extern "C" {
                           size_t wsize, tfunc_t pf);
   void chThdSetPriority(tprio_t newprio);
   void chThdExit(msg_t msg);
-#ifdef CH_USE_RESUME
   void chThdResume(Thread *tp);
-#endif
-#ifdef CH_USE_SUSPEND
   void chThdSuspend(Thread **tpp);
-#endif
-#ifdef CH_USE_TERMINATE
   void chThdTerminate(Thread *tp);
-#endif
 #ifdef CH_USE_WAITEXIT
   msg_t chThdWait(Thread *tp);
 #endif
diff --git a/src/templates/chconf.h b/src/templates/chconf.h
index 65ae9870e..1f6fc879e 100644
--- a/src/templates/chconf.h
+++ b/src/templates/chconf.h
@@ -47,23 +47,6 @@
  *  included in the kernel.*/
 #define CH_USE_SYSTEMTIME
 
-/** Configuration option: if specified then the \p chThdSleep() function is
- *  included in the kernel.
- * @note requires \p CH_USE_VIRTUAL_TIMERS.*/
-#define CH_USE_SLEEP
-
-/** Configuration option: if specified then the \p chThdResume()
- *  function is included in the kernel.*/
-#define CH_USE_RESUME
-
-/** Configuration option: if specified then the \p chThdSuspend()
- *  function is included in the kernel.*/
-#define CH_USE_SUSPEND
-
-/** Configuration option: if specified then the \p chThdTerminate()
- *  and \p chThdShouldTerminate() functions are included in the kernel.*/
-#define CH_USE_TERMINATE
-
 /** Configuration option: if specified then the \p chThdWait() function
  *  is included in the kernel.*/
 #define CH_USE_WAITEXIT