diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-05 09:01:21 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-05 09:01:21 +0000 |
commit | 867c7c95aa67ea1f19286c3593500214101bacd9 (patch) | |
tree | 1b094e37b25017a849a5eb5383bc141622654c81 /os/rt | |
parent | e5e278c89f2edd0750749dfca551fc531cf317f2 (diff) | |
download | ChibiOS-867c7c95aa67ea1f19286c3593500214101bacd9.tar.gz ChibiOS-867c7c95aa67ea1f19286c3593500214101bacd9.tar.bz2 ChibiOS-867c7c95aa67ea1f19286c3593500214101bacd9.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6262 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt')
-rw-r--r-- | os/rt/include/chvt.h | 10 | ||||
-rw-r--r-- | os/rt/ports/ARMCMx/chcore_v7m.c | 2 | ||||
-rw-r--r-- | os/rt/src/chsys.c | 8 | ||||
-rw-r--r-- | os/rt/src/chthreads.c | 2 |
4 files changed, 15 insertions, 7 deletions
diff --git a/os/rt/include/chvt.h b/os/rt/include/chvt.h index d4948f1d6..447c4deee 100644 --- a/os/rt/include/chvt.h +++ b/os/rt/include/chvt.h @@ -257,7 +257,7 @@ static inline bool chVTIsSystemTimeWithin(systime_t start, systime_t end) { /**
* @brief Returns @p true if the specified timer is armed.
* @pre The timer must have been initialized using @p chVTObjectInit()
- * or @p chVTSetI() (or @p chVTSetI() variants).
+ * or @p chVTDoSetI().
*
* @param[in] vtp the @p virtual_timer_t structure pointer
* @return true if the timer is armed.
@@ -274,6 +274,8 @@ static inline bool chVTIsArmedI(virtual_timer_t *vtp) { /**
* @brief Disables a Virtual Timer.
* @note The timer is first checked and disabled only if armed.
+ * @pre The timer must have been initialized using @p chVTObjectInit()
+ * or @p chVTDoSetI().
*
* @param[in] vtp the @p virtual_timer_t structure pointer
*
@@ -288,6 +290,8 @@ static inline void chVTResetI(virtual_timer_t *vtp) { /**
* @brief Disables a Virtual Timer.
* @note The timer is first checked and disabled only if armed.
+ * @pre The timer must have been initialized using @p chVTObjectInit()
+ * or @p chVTDoSetI().
*
* @param[in] vtp the @p virtual_timer_t structure pointer
*
@@ -304,6 +308,8 @@ static inline void chVTReset(virtual_timer_t *vtp) { * @brief Enables a virtual timer.
* @details If the virtual timer was already enabled then it is re-enabled
* using the new parameters.
+ * @pre The timer must have been initialized using @p chVTObjectInit()
+ * or @p chVTDoSetI().
*
* @param[in] vtp the @p virtual_timer_t structure pointer
* @param[in] delay the number of ticks before the operation timeouts.
@@ -326,6 +332,8 @@ static inline void chVTSetI(virtual_timer_t *vtp, systime_t delay, * @brief Enables a virtual timer.
* @details If the virtual timer was already enabled then it is re-enabled
* using the new parameters.
+ * @pre The timer must have been initialized using @p chVTObjectInit()
+ * or @p chVTDoSetI().
*
* @param[in] vtp the @p virtual_timer_t structure pointer
* @param[in] delay the number of ticks before the operation timeouts.
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.c b/os/rt/ports/ARMCMx/chcore_v7m.c index 49826c48c..ff9219ac6 100644 --- a/os/rt/ports/ARMCMx/chcore_v7m.c +++ b/os/rt/ports/ARMCMx/chcore_v7m.c @@ -71,7 +71,7 @@ void SVC_Handler(void) { #if CORTEX_USE_FPU
/* Restoring the special register FPCCR.*/
FPU->FPCCR = (uint32_t)ctxp->fpccr;
- FPU->FPCAR = FPU->FPCAR + sizeof (struct extctx);
+ FPU->FPCAR = FPU->FPCAR + sizeof (struct port_extctx);
#endif
/* Writing back the modified PSP value.*/
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c index c0be6422b..94f1afd51 100644 --- a/os/rt/src/chsys.c +++ b/os/rt/src/chsys.c @@ -261,7 +261,7 @@ void chSysRestoreStatusX(syssts_t sts) { }
}
-#if CH_PORT_SUPPORTS_RT || defined(__DOXYGEN__)
+#if PORT_SUPPORTS_RT || defined(__DOXYGEN__)
/**
* @brief Realtime window test.
* @details This function verifies if the current realtime counter value
@@ -270,7 +270,7 @@ void chSysRestoreStatusX(syssts_t sts) { * @note When start==end then the function returns always true because the
* whole time range is specified.
* @note This function is only available if the port layer supports the
- * option @p CH_PORT_SUPPORTS_RT.
+ * option @p PORT_SUPPORTS_RT.
*
* @param[in] cnt the counter value to be tested
* @param[in] start the start of the time window (inclusive)
@@ -291,7 +291,7 @@ bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end) { * @note The real delay is always few cycles in excess of the specified
* value.
* @note This function is only available if the port layer supports the
- * option @p CH_PORT_SUPPORTS_RT.
+ * option @p PORT_SUPPORTS_RT.
*
* @param[in] cycles number of cycles
*
@@ -303,6 +303,6 @@ void chSysPolledDelayX(rtcnt_t cycles) { while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end))
;
}
-#endif /* CH_PORT_SUPPORTS_RT */
+#endif /* PORT_SUPPORTS_RT */
/** @} */
diff --git a/os/rt/src/chthreads.c b/os/rt/src/chthreads.c index 35f53a072..042d90c5e 100644 --- a/os/rt/src/chthreads.c +++ b/os/rt/src/chthreads.c @@ -181,7 +181,7 @@ thread_t *chThdCreateI(void *wsp, size_t size, thread_t *tp = wsp;
chDbgCheckClassI();
- chDbgCheck((wsp != NULL) && (size >= THD_WA_SIZE(0)) &&
+ chDbgCheck((wsp != NULL) && (size >= THD_WORKING_AREA_SIZE(0)) &&
(prio <= HIGHPRIO) && (pf != NULL));
PORT_SETUP_CONTEXT(tp, wsp, size, pf, arg);
|