diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-02 16:38:13 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-02 16:38:13 +0000 |
| commit | 69f211ae2c3f7a42d65e9f3bdb4e192016a53d94 (patch) | |
| tree | 2241b536eb349dd81abb7ce17781980df72dca94 /os/hal/osal | |
| parent | a94bfc5f713ee3b7659c53458b61f40ff39dc660 (diff) | |
| download | ChibiOS-69f211ae2c3f7a42d65e9f3bdb4e192016a53d94.tar.gz ChibiOS-69f211ae2c3f7a42d65e9f3bdb4e192016a53d94.tar.bz2 ChibiOS-69f211ae2c3f7a42d65e9f3bdb4e192016a53d94.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7462 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/osal')
| -rw-r--r-- | os/hal/osal/nil/osal.h | 9 | ||||
| -rw-r--r-- | os/hal/osal/rt/osal.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h index 37838cc88..7e8580776 100644 --- a/os/hal/osal/nil/osal.h +++ b/os/hal/osal/nil/osal.h @@ -265,13 +265,13 @@ typedef struct { * @note Not implemented in this simplified OSAL.
*/
#define osalDbgCheckClassI() /*chDbgCheckClassI()*/
-/** @} */
/**
* @brief S-Class state check.
* @note Not implemented in this simplified OSAL.
*/
#define osalDbgCheckClassS() /*chDbgCheckClassS()*/
+/** @} */
/**
* @name IRQ service routines wrappers
@@ -325,6 +325,7 @@ typedef struct { * @api
*/
#define OSAL_MS2ST(msec) MS2ST(msec)
+
/**
* @brief Microseconds to system ticks.
* @details Converts from microseconds to system ticks number.
@@ -388,8 +389,8 @@ typedef struct { #ifdef __cplusplus
extern "C" {
#endif
- void osalThreadDequeueNextI(threads_queue_t *tqp, msg_t msg);
- void osalThreadDequeueAllI(threads_queue_t *tqp, msg_t msg);
+ void osalThreadDequeueNextI(threads_queue_t *tqp, msg_t msg);
+ void osalThreadDequeueAllI(threads_queue_t *tqp, msg_t msg);
#ifdef __cplusplus
}
#endif
@@ -539,7 +540,7 @@ static inline void osalOsRescheduleS(void) { /**
* @brief Current system time.
- * @details Returns the number of system ticks since the @p chSysInit()
+ * @details Returns the number of system ticks since the @p osalInit()
* invocation.
* @note The counter can reach its maximum and then restart from zero.
* @note This function can be called from any context but its atomicity
diff --git a/os/hal/osal/rt/osal.h b/os/hal/osal/rt/osal.h index ef2104548..1b5a72d76 100644 --- a/os/hal/osal/rt/osal.h +++ b/os/hal/osal/rt/osal.h @@ -261,13 +261,13 @@ typedef struct { * @note Not implemented in this simplified OSAL.
*/
#define osalDbgCheckClassI() chDbgCheckClassI()
-/** @} */
/**
* @brief S-Class state check.
* @note Not implemented in this simplified OSAL.
*/
#define osalDbgCheckClassS() chDbgCheckClassS()
+/** @} */
/**
* @name IRQ service routines wrappers
@@ -535,7 +535,7 @@ static inline void osalOsRescheduleS(void) { /**
* @brief Current system time.
- * @details Returns the number of system ticks since the @p chSysInit()
+ * @details Returns the number of system ticks since the @p osalInit()
* invocation.
* @note The counter can reach its maximum and then restart from zero.
* @note This function can be called from any context but its atomicity
|