andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverted bug #1060. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13220 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2019-12-21 11:08:35 +00:00
parent 0ffa6f42bf
commit 4866bfadb6
8 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/osal/os-less/ARMCMx/osal.h
View File

@ -687,8 +687,8 @@ static inline sysinterval_t osalTimeDiffX(systime_t start, systime_t end) {
/** /**
* @brief Checks if the specified time is within the specified time window. * @brief Checks if the specified time is within the specified time window.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because the
* whole time range is specified. * time window has zero size.
* @note This function can be called from any context. * @note This function can be called from any context.
* *
* @param[in] time the time to be verified * @param[in] time the time to be verified
@ -703,8 +703,8 @@ static inline bool osalTimeIsInRangeX(systime_t time,
systime_t start, systime_t start,
systime_t end) { systime_t end) {
return (bool)((systime_t)((systime_t)time - (systime_t)start) <= return (bool)((systime_t)((systime_t)time - (systime_t)start) <
(systime_t)((systime_t)end - (systime_t)start - (systime_t)1)); (systime_t)((systime_t)end - (systime_t)start));
} }
/** /**

4
os/hal/osal/os-less/AVR/osal.h
View File

@ -609,8 +609,8 @@ static inline void osalSysRestoreStatusX(syssts_t sts) {
/** /**
* @brief Checks if the specified time is within the specified time window. * @brief Checks if the specified time is within the specified time window.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because the
* whole time range is specified. * time window has zero size.
* @note This function can be called from any context. * @note This function can be called from any context.
* *
* @param[in] time the time to be verified * @param[in] time the time to be verified

8
os/hal/templates/osal/osal.h
View File

@ -623,8 +623,8 @@ static inline sysinterval_t osalTimeDiffX(systime_t start, systime_t end) {
/** /**
* @brief Checks if the specified time is within the specified time window. * @brief Checks if the specified time is within the specified time window.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because the
* whole time range is specified. * time window has zero size.
* @note This function can be called from any context. * @note This function can be called from any context.
* *
* @param[in] time the time to be verified * @param[in] time the time to be verified
@ -639,8 +639,8 @@ static inline bool osalTimeIsInRangeX(systime_t time,
systime_t start, systime_t start,
systime_t end) { systime_t end) {
return (bool)((systime_t)((systime_t)time - (systime_t)start) <= return (bool)((systime_t)((systime_t)time - (systime_t)start) <
(systime_t)((systime_t)end - (systime_t)start - (systime_t)1)); (systime_t)((systime_t)end - (systime_t)start));
} }
/** /**

4
os/nil/include/ch.h
View File

@ -1241,8 +1241,8 @@ struct nil_system {
/** /**
* @brief Checks if the current system time is within the specified time * @brief Checks if the current system time is within the specified time
* window. * window.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because the
* whole time range is specified. * time window has zero size.
* *
* @param[in] start the start of the time window (inclusive) * @param[in] start the start of the time window (inclusive)
* @param[in] end the end of the time window (non inclusive) * @param[in] end the end of the time window (non inclusive)

16
os/nil/src/ch.c
View File

@ -527,8 +527,8 @@ void chSysRestoreStatusX(syssts_t sts) {
* @details This function verifies if the current realtime counter value * @details This function verifies if the current realtime counter value
* lies within the specified range or not. The test takes care * lies within the specified range or not. The test takes care
* of the realtime counter wrapping to zero on overflow. * of the realtime counter wrapping to zero on overflow.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because a
* whole time range is specified. * null time range is specified.
* @note This function is only available if the port layer supports the * @note This function is only available if the port layer supports the
* option @p PORT_SUPPORTS_RT. * option @p PORT_SUPPORTS_RT.
* *
@ -542,8 +542,8 @@ void chSysRestoreStatusX(syssts_t sts) {
*/ */
bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end) { bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end) {
return (bool)(((rtcnt_t)cnt - (rtcnt_t)start) <= return (bool)(((rtcnt_t)cnt - (rtcnt_t)start) <
((rtcnt_t)end - (rtcnt_t)start - (rtcnt_t)1)); ((rtcnt_t)end - (rtcnt_t)start));
} }
/** /**
@ -725,8 +725,8 @@ msg_t chSchGoSleepTimeoutS(tstate_t newstate, sysinterval_t timeout) {
/** /**
* @brief Checks if the specified time is within the specified time range. * @brief Checks if the specified time is within the specified time range.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because the
* whole time range is specified. * time window has zero size.
* *
* @param[in] time the time to be verified * @param[in] time the time to be verified
* @param[in] start the start of the time window (inclusive) * @param[in] start the start of the time window (inclusive)
@ -738,8 +738,8 @@ msg_t chSchGoSleepTimeoutS(tstate_t newstate, sysinterval_t timeout) {
*/ */
bool chTimeIsInRangeX(systime_t time, systime_t start, systime_t end) { bool chTimeIsInRangeX(systime_t time, systime_t start, systime_t end) {
return (bool)((systime_t)((systime_t)(time) - (systime_t)(start)) <= return (bool)((systime_t)((systime_t)(time) - (systime_t)(start)) <
(systime_t)((systime_t)(end) - (systime_t)(start) - (systime_t)1)); (systime_t)((systime_t)(end) - (systime_t)(start)));
} }
/** /**

8
os/rt/include/chtime.h
View File

@ -466,8 +466,8 @@ static inline sysinterval_t chTimeDiffX(systime_t start, systime_t end) {
/** /**
* @brief Checks if the specified time is within the specified time range. * @brief Checks if the specified time is within the specified time range.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because the
* whole time range is specified. * time window has zero size.
* *
* @param[in] time the time to be verified * @param[in] time the time to be verified
* @param[in] start the start of the time window (inclusive) * @param[in] start the start of the time window (inclusive)
@ -481,8 +481,8 @@ static inline bool chTimeIsInRangeX(systime_t time,
systime_t start, systime_t start,
systime_t end) { systime_t end) {
return (bool)((systime_t)((systime_t)time - (systime_t)start) <= return (bool)((systime_t)((systime_t)time - (systime_t)start) <
(systime_t)((systime_t)end - (systime_t)start - (systime_t)1)); (systime_t)((systime_t)end - (systime_t)start));
} }
/** @} */ /** @} */

8
os/rt/src/chsys.c
View File

@ -403,8 +403,8 @@ void chSysRestoreStatusX(syssts_t sts) {
* @details This function verifies if the current realtime counter value * @details This function verifies if the current realtime counter value
* lies within the specified range or not. The test takes care * lies within the specified range or not. The test takes care
* of the realtime counter wrapping to zero on overflow. * of the realtime counter wrapping to zero on overflow.
* @note When start==end then the function returns always true because the * @note When start==end then the function returns always false because a
* whole time range is specified. * null time range is specified.
* @note This function is only available if the port layer supports the * @note This function is only available if the port layer supports the
* option @p PORT_SUPPORTS_RT. * option @p PORT_SUPPORTS_RT.
* *
@ -418,8 +418,8 @@ void chSysRestoreStatusX(syssts_t sts) {
*/ */
bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end) { bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end) {
return (bool)(((rtcnt_t)cnt - (rtcnt_t)start) <= return (bool)(((rtcnt_t)cnt - (rtcnt_t)start) <
((rtcnt_t)end - (rtcnt_t)start - (rtcnt_t)1)); ((rtcnt_t)end - (rtcnt_t)start));
} }
/** /**

2
readme.txt
View File

@ -145,8 +145,6 @@
- NIL: Integrated NIL 4.0. - NIL: Integrated NIL 4.0.
- FIX: Fixed I2C fallback driver broken (bug #1061) - FIX: Fixed I2C fallback driver broken (bug #1061)
(backported to 19.1.4)(backported to 18.2.3). (backported to 19.1.4)(backported to 18.2.3).
- FIX: Fixed bug in chVTGetSystemTimeX() (bug #1060)
(backported to 19.1.4)(backported to 18.2.3).
- FIX: Fixed STM32 ADC1 sample time macros (bug #1059) - FIX: Fixed STM32 ADC1 sample time macros (bug #1059)
(backported to 19.1.4)(backported to 18.2.3). (backported to 19.1.4)(backported to 18.2.3).
- FIX: Fixed STM32 ADCv1 error callback disabled on some devices (bug #1058) - FIX: Fixed STM32 ADCv1 error callback disabled on some devices (bug #1058)