Improved time range functions. Reduced size for NIL when tickless mode is used.

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

2 files changed, 17 insertions, 21 deletions

diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index 480baa0e6..b6ef8436d 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -720,6 +720,23 @@ typedef struct {
 #endif

 

 /**

+ * @brief   Checks if the specified time is within the specified time window.

+ * @note    When start==end then the function returns always true because the

+ *          whole time range is specified.

+ * @note    This function can be called from any context.

+ *

+ * @param[in] time      the time to be verified

+ * @param[in] start     the start of the time window (inclusive)

+ * @param[in] end       the end of the time window (non inclusive)

+ * @retval true         current time within the specified time window.

+ * @retval false        current time not within the specified time window.

+ *

+ * @xclass

+ */

+#define chVTIsTimeWithinX(time, start, end)                                 \

+  ((bool)((time) - (start) < (end) - (start)))

+

+/**

  * @brief   Condition assertion.

  * @details If the condition check fails then the kernel panics with a

  *          message and halts.

@@ -765,7 +782,6 @@ extern "C" {
   void chThdResumeI(thread_reference_t *trp, msg_t msg);

   void chThdSleep(systime_t time);

   void chThdSleepUntil(systime_t time);

-  bool chVTIsTimeWithinX(systime_t time, systime_t start, systime_t end);

   msg_t chSemWaitTimeout(semaphore_t *sp, systime_t time);

   msg_t chSemWaitTimeoutS(semaphore_t *sp, systime_t time);

   void chSemSignal(semaphore_t *sp);

diff --git a/os/nil/src/nil.c b/os/nil/src/nil.c
index 5d9a660f7..9141129cb 100644
--- a/os/nil/src/nil.c
+++ b/os/nil/src/nil.c
@@ -467,26 +467,6 @@ void chThdSleepUntil(systime_t time) {
 }

 

 /**

- * @brief   Checks if the specified time is within the specified time window.

- * @note    When start==end then the function returns always true because the

- *          whole time range is specified.

- * @note    This function can be called from any context.

- *

- * @param[in] time      the time to be verified

- * @param[in] start     the start of the time window (inclusive)

- * @param[in] end       the end of the time window (non inclusive)

- * @retval true         current time within the specified time window.

- * @retval false        current time not within the specified time window.

- *

- * @xclass

- */

-bool chVTIsTimeWithinX(systime_t time, systime_t start, systime_t end) {

-

-  return end > start ? (time >= start) && (time < end) :

-                       (time >= start) || (time < end);

-}

-

-/**

  * @brief   Performs a wait operation on a semaphore with timeout specification.

  *

  * @param[in] sp        pointer to a @p semaphore_t structure