From d1ffba4de3c102f20a1985a7c5576a9627bd5287 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 3 Sep 2008 10:58:43 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@420
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 src/chthreads.c       | 21 +++------------------
 src/include/threads.h |  2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/chthreads.c b/src/chthreads.c
index 4dc8be79d..e95abbe73 100644
--- a/src/chthreads.c
+++ b/src/chthreads.c
@@ -173,7 +173,6 @@ void chThdSetPriority(tprio_t newprio) {
   chSysUnlock();
 }
 
-#ifdef CH_USE_SUSPEND
 /**
  * Suspends the invoking thread.
  *
@@ -182,42 +181,28 @@ void chThdSetPriority(tprio_t newprio) {
  *            \p PRSUSPENDED state, it is set to \p NULL after it is resumed.
  *            This allows to implement a "test and resume" on the variable
  *            into interrupt handlers.
- * @note The function is available only if the \p CH_USE_SUSPEND
- *       option is enabled in \p chconf.h.
  */
 void chThdSuspend(Thread **tpp) {
 
   chSysLock();
-
   chDbgAssert(*tpp == NULL, "chthreads.c, chThdSuspend()");
   *tpp = currp;
   chSchGoSleepS(PRSUSPENDED);
   *tpp = NULL;
-
   chSysUnlock();
 }
-#endif /* CH_USE_SUSPEND */
 
-#ifdef CH_USE_RESUME
 /**
- * Resumes a thread created with the \p P_SUSPENDED option or suspended with
- * \p chThdSuspend().
+ * Resumes a suspended thread.
  * @param tp the pointer to the thread
- * @note The function has no effect on threads in any other state than
- *       \p PRSUSPENDED.
- * @note The function is available only if the \p CH_USE_RESUME
- *       option is enabled in \p chconf.h.
  */
 void chThdResume(Thread *tp) {
 
   chSysLock();
-
-  if ((tp)->p_state == PRSUSPENDED)
-    chSchWakeupS(tp, RDY_OK);
-
+  chDbgAssert(tp->p_state == PRSUSPENDED, "chthreads.c, chThdResume()");
+  chSchWakeupS(tp, RDY_OK);
   chSysUnlock();
 }
-#endif
 
 #ifdef CH_USE_TERMINATE
 /**
diff --git a/src/include/threads.h b/src/include/threads.h
index 1572417d6..b74ba60b4 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -239,7 +239,7 @@ extern "C" {
  * \p chThdSuspend().
  * @param tp the pointer to the thread
  */
-#define chThdResumeI(tp) chSchReadyI((tp), RDY_OK)
+#define chThdResumeI(tp) chSchReadyI(tp)
 
 #endif  /* _THREADS_H_ */
 
-- 
cgit v1.2.3