diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-02-10 10:58:17 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-02-10 10:58:17 +0000 |
commit | 7c1bfd409dc3e12b9a5bafff94f845598b96f67c (patch) | |
tree | f70ede3f895d4a78d5f356e8a5cffa57b5b56bc1 | |
parent | 5e65b9fce1697a5b1dfdd53c10baa6f2e2aeaf66 (diff) | |
download | ChibiOS-7c1bfd409dc3e12b9a5bafff94f845598b96f67c.tar.gz ChibiOS-7c1bfd409dc3e12b9a5bafff94f845598b96f67c.tar.bz2 ChibiOS-7c1bfd409dc3e12b9a5bafff94f845598b96f67c.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6692 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | os/hal/osal/nil/osal.h | 43 | ||||
-rw-r--r-- | os/hal/osal/rt/osal.h | 43 | ||||
-rw-r--r-- | test/lib/ch_test.c | 2 |
3 files changed, 87 insertions, 1 deletions
diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h index 2c0980ead..d0811d444 100644 --- a/os/hal/osal/nil/osal.h +++ b/os/hal/osal/nil/osal.h @@ -340,6 +340,49 @@ typedef struct { #define OSAL_US2ST(usec) US2ST(usec)
/** @} */
+/**
+ * @name Sleep macros using absolute time
+ * @{
+ */
+/**
+ * @brief Delays the invoking thread for the specified number of seconds.
+ * @note The specified time is rounded up to a value allowed by the real
+ * system tick clock.
+ * @note The maximum specifiable value is implementation dependent.
+ *
+ * @param[in] sec time in seconds, must be different from zero
+ *
+ * @api
+ */
+#define osalThreadSleepSeconds(sec) osalThreadSleep(OSAL_S2ST(sec))
+
+/**
+ * @brief Delays the invoking thread for the specified number of
+ * milliseconds.
+ * @note The specified time is rounded up to a value allowed by the real
+ * system tick clock.
+ * @note The maximum specifiable value is implementation dependent.
+ *
+ * @param[in] msec time in milliseconds, must be different from zero
+ *
+ * @api
+ */
+#define osalThreadSleepMilliseconds(msec) osalThreadSleep(OSAL_MS2ST(msec))
+
+/**
+ * @brief Delays the invoking thread for the specified number of
+ * microseconds.
+ * @note The specified time is rounded up to a value allowed by the real
+ * system tick clock.
+ * @note The maximum specifiable value is implementation dependent.
+ *
+ * @param[in] usec time in microseconds, must be different from zero
+ *
+ * @api
+ */
+#define osalThreadSleepMicroseconds(usec) osalThreadSleep(OSAL_US2ST(usec))
+/** @} */
+
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
diff --git a/os/hal/osal/rt/osal.h b/os/hal/osal/rt/osal.h index c26b9853d..74044616a 100644 --- a/os/hal/osal/rt/osal.h +++ b/os/hal/osal/rt/osal.h @@ -337,6 +337,49 @@ typedef struct { #define OSAL_US2ST(usec) US2ST(usec)
/** @} */
+/**
+ * @name Sleep macros using absolute time
+ * @{
+ */
+/**
+ * @brief Delays the invoking thread for the specified number of seconds.
+ * @note The specified time is rounded up to a value allowed by the real
+ * system tick clock.
+ * @note The maximum specifiable value is implementation dependent.
+ *
+ * @param[in] sec time in seconds, must be different from zero
+ *
+ * @api
+ */
+#define osalThreadSleepSeconds(sec) osalThreadSleep(OSAL_S2ST(sec))
+
+/**
+ * @brief Delays the invoking thread for the specified number of
+ * milliseconds.
+ * @note The specified time is rounded up to a value allowed by the real
+ * system tick clock.
+ * @note The maximum specifiable value is implementation dependent.
+ *
+ * @param[in] msec time in milliseconds, must be different from zero
+ *
+ * @api
+ */
+#define osalThreadSleepMilliseconds(msec) osalThreadSleep(OSAL_MS2ST(msec))
+
+/**
+ * @brief Delays the invoking thread for the specified number of
+ * microseconds.
+ * @note The specified time is rounded up to a value allowed by the real
+ * system tick clock.
+ * @note The maximum specifiable value is implementation dependent.
+ *
+ * @param[in] usec time in microseconds, must be different from zero
+ *
+ * @api
+ */
+#define osalThreadSleepMicroseconds(usec) osalThreadSleep(OSAL_US2ST(usec))
+/** @} */
+
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
diff --git a/test/lib/ch_test.c b/test/lib/ch_test.c index c8735ba5b..cb1df734f 100644 --- a/test/lib/ch_test.c +++ b/test/lib/ch_test.c @@ -257,7 +257,7 @@ msg_t test_execute(BaseSequentialStream *stream) { test_print(test_suite[i][j]->name);
test_println(")");
#if TEST_DELAY_BETWEEN_TESTS > 0
- osalThreadSleep(OSAL_MS2ST(TEST_DELAY_BETWEEN_TESTS));
+ osalThreadSleepMilliseconds(TEST_DELAY_BETWEEN_TESTS);
#endif
execute_test(test_suite[i][j]);
if (test_local_fail) {
|