diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-27 10:22:40 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-27 10:22:40 +0000 |
| commit | 71ccd7eb14c4cb3cc4362feda7adc19ec2fd0ff8 (patch) | |
| tree | e136d0d671a42cf67fd79853385bd6a100468b61 /os/rt/include | |
| parent | 56a33f50edb32b44b68125c961ae9125431b7965 (diff) | |
| download | ChibiOS-71ccd7eb14c4cb3cc4362feda7adc19ec2fd0ff8.tar.gz ChibiOS-71ccd7eb14c4cb3cc4362feda7adc19ec2fd0ff8.tar.bz2 ChibiOS-71ccd7eb14c4cb3cc4362feda7adc19ec2fd0ff8.zip | |
Renamed thread field "preempt" in "ticks" for clearness.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11079 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/include')
| -rw-r--r-- | os/rt/include/chschd.h | 4 | ||||
| -rw-r--r-- | os/rt/include/chvt.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/os/rt/include/chschd.h b/os/rt/include/chschd.h index f62f6d709..c5cc00b22 100644 --- a/os/rt/include/chschd.h +++ b/os/rt/include/chschd.h @@ -181,7 +181,7 @@ struct ch_thread { * @brief Number of ticks remaining to this thread.
*/
#if (CH_CFG_TIME_QUANTUM > 0) || defined(__DOXYGEN__)
- tslices_t preempt;
+ tslices_t ticks;
#endif
#if (CH_DBG_THREADS_PROFILING == TRUE) || defined(__DOXYGEN__)
/**
@@ -694,7 +694,7 @@ static inline void chSchPreemption(void) { tprio_t p2 = currp->prio;
#if CH_CFG_TIME_QUANTUM > 0
- if (currp->preempt > (tslices_t)0) {
+ if (currp->ticks > (tslices_t)0) {
if (p1 > p2) {
chSchDoRescheduleAhead();
}
diff --git a/os/rt/include/chvt.h b/os/rt/include/chvt.h index 2102df345..412540c07 100644 --- a/os/rt/include/chvt.h +++ b/os/rt/include/chvt.h @@ -45,9 +45,9 @@ "be zero or greater than one"
#endif
-#if (CH_CFG_ST_TIMEDELTA > 0) && (CH_CFG_TIME_QUANTUM > 0)
-#error "CH_CFG_TIME_QUANTUM not supported in tickless mode"
-#endif
+//#if (CH_CFG_ST_TIMEDELTA > 0) && (CH_CFG_TIME_QUANTUM > 0)
+//#error "CH_CFG_TIME_QUANTUM not supported in tickless mode"
+//#endif
#if (CH_CFG_ST_TIMEDELTA > 0) && (CH_DBG_THREADS_PROFILING == TRUE)
#error "CH_DBG_THREADS_PROFILING not supported in tickless mode"
|