Fixed bug #629.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8214 35acf78f-673a-0410-8e92-d51de3d6d3f4

11 files changed, 300 insertions, 7 deletions

diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h
index 7148bde4e..d886d6dc7 100644
--- a/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h
+++ b/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h
@@ -55,7 +55,7 @@
  * @brief   System time counter resolution.

  * @note    Allowed values are 16 or 32 bits.

  */

-#define NIL_CFG_ST_RESOLUTION               32

+#define NIL_CFG_ST_RESOLUTION               16

 

 /**

  * @brief   System tick frequency.

@@ -63,7 +63,7 @@
  *          option defines the maximum amount of time allowed for

  *          timeouts.

  */

-#define NIL_CFG_ST_FREQUENCY                50000

+#define NIL_CFG_ST_FREQUENCY                1000

 

 /**

  * @brief   Time delta constant for the tick-less mode.

diff --git a/doc/nil/Doxyfile_chm b/doc/nil/Doxyfile_chm
index 614a21d24..031e5f867 100644
--- a/doc/nil/Doxyfile_chm
+++ b/doc/nil/Doxyfile_chm
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/NIL
 # could be handy for archiving the generated documentation or if some version

 # control system is used.

 

-PROJECT_NUMBER         = 1.0.0

+PROJECT_NUMBER         = 1.1.0

 

 # Using the PROJECT_BRIEF tag one can provide an optional one line description

 # for a project that appears at the top of each page and should give viewer a

diff --git a/doc/nil/Doxyfile_html b/doc/nil/Doxyfile_html
index cf2e23e11..a19efd4d3 100644
--- a/doc/nil/Doxyfile_html
+++ b/doc/nil/Doxyfile_html
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/NIL
 # could be handy for archiving the generated documentation or if some version

 # control system is used.

 

-PROJECT_NUMBER         = 1.0.0

+PROJECT_NUMBER         = 1.1.0

 

 # Using the PROJECT_BRIEF tag one can provide an optional one line description

 # for a project that appears at the top of each page and should give viewer a

diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h
index 84d83d8c2..d4538bc7b 100644
--- a/os/hal/osal/nil/osal.h
+++ b/os/hal/osal/nil/osal.h
@@ -345,6 +345,52 @@ typedef struct {
 /** @} */

 

 /**

+ * @name    Time conversion utilities for the realtime counter

+ * @{

+ */

+/**

+ * @brief   Seconds to realtime counter.

+ * @details Converts from seconds to realtime counter cycles.

+ * @note    The macro assumes that @p freq >= @p 1.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] sec       number of seconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_S2RTC(freq, sec) S2RTC(freq, sec)

+

+/**

+ * @brief   Milliseconds to realtime counter.

+ * @details Converts from milliseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next millisecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] msec      number of milliseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_MS2RTC(freq, msec) MS2RTC(freq, msec)

+

+/**

+ * @brief   Microseconds to realtime counter.

+ * @details Converts from microseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next microsecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] usec      number of microseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_US2RTC(freq, usec) US2RTC(freq, usec)

+/** @} */

+

+/**

  * @name    Sleep macros using absolute time

  * @{

  */

diff --git a/os/hal/osal/os-less/ARMCMx/osal.h b/os/hal/osal/os-less/ARMCMx/osal.h
index c54ed9327..3887f8f04 100644
--- a/os/hal/osal/os-less/ARMCMx/osal.h
+++ b/os/hal/osal/os-less/ARMCMx/osal.h
@@ -444,6 +444,52 @@ typedef struct {
 /** @} */

 

 /**

+ * @name    Time conversion utilities for the realtime counter

+ * @{

+ */

+/**

+ * @brief   Seconds to realtime counter.

+ * @details Converts from seconds to realtime counter cycles.

+ * @note    The macro assumes that @p freq >= @p 1.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] sec       number of seconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_S2RTC(freq, sec) ((freq) * (sec))

+

+/**

+ * @brief   Milliseconds to realtime counter.

+ * @details Converts from milliseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next millisecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] msec      number of milliseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_MS2RTC(freq, msec) (rtcnt_t)((((freq) + 999UL) / 1000UL) * (msec))

+

+/**

+ * @brief   Microseconds to realtime counter.

+ * @details Converts from microseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next microsecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] usec      number of microseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_US2RTC(freq, usec) (rtcnt_t)((((freq) + 999999UL) / 1000000UL) * (usec))

+/** @} */

+

+/**

  * @name    Sleep macros using absolute time

  * @{

  */

diff --git a/os/hal/osal/rt/osal.h b/os/hal/osal/rt/osal.h
index aae2b5d3f..96b493905 100644
--- a/os/hal/osal/rt/osal.h
+++ b/os/hal/osal/rt/osal.h
@@ -337,6 +337,52 @@ typedef struct {
 /** @} */

 

 /**

+ * @name    Time conversion utilities for the realtime counter

+ * @{

+ */

+/**

+ * @brief   Seconds to realtime counter.

+ * @details Converts from seconds to realtime counter cycles.

+ * @note    The macro assumes that @p freq >= @p 1.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] sec       number of seconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_S2RTC(freq, sec) S2RTC(freq, sec)

+

+/**

+ * @brief   Milliseconds to realtime counter.

+ * @details Converts from milliseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next millisecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] msec      number of milliseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_MS2RTC(freq, msec) MS2RTC(freq, msec)

+

+/**

+ * @brief   Microseconds to realtime counter.

+ * @details Converts from microseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next microsecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] usec      number of microseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_US2RTC(freq, usec) US2RTC(freq, usec)

+/** @} */

+

+/**

  * @name    Sleep macros using absolute time

  * @{

  */

diff --git a/os/hal/templates/osal/osal.h b/os/hal/templates/osal/osal.h
index f73070aa4..f0ead5c0b 100644
--- a/os/hal/templates/osal/osal.h
+++ b/os/hal/templates/osal/osal.h
@@ -363,6 +363,52 @@ typedef struct {
 /** @} */

 

 /**

+ * @name    Time conversion utilities for the realtime counter

+ * @{

+ */

+/**

+ * @brief   Seconds to realtime counter.

+ * @details Converts from seconds to realtime counter cycles.

+ * @note    The macro assumes that @p freq >= @p 1.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] sec       number of seconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_S2RTC(freq, sec) ((freq) * (sec))

+

+/**

+ * @brief   Milliseconds to realtime counter.

+ * @details Converts from milliseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next millisecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] msec      number of milliseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_MS2RTC(freq, msec) (rtcnt_t)((((freq) + 999UL) / 1000UL) * (msec))

+

+/**

+ * @brief   Microseconds to realtime counter.

+ * @details Converts from microseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next microsecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] usec      number of microseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define OSAL_US2RTC(freq, usec) (rtcnt_t)((((freq) + 999999UL) / 1000000UL) * (usec))

+/** @} */

+

+/**

  * @name    Sleep macros using absolute time

  * @{

  */

diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index 0b40e3815..b94fb8eab 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -61,7 +61,7 @@ typedef struct nil_thread thread_t;
 /**

  * @brief   Kernel version string.

  */

-#define CH_KERNEL_VERSION       "1.0.0"

+#define CH_KERNEL_VERSION       "1.1.0"

 

 /**

  * @brief   Kernel version major number.

@@ -71,7 +71,7 @@ typedef struct nil_thread thread_t;
 /**

  * @brief   Kernel version minor number.

  */

-#define CH_KERNEL_MINOR         0

+#define CH_KERNEL_MINOR         1

 

 /**

  * @brief   Kernel version patch number.

@@ -637,10 +637,70 @@ struct nil_system {
 /** @} */

 

 /**

+ * @name    Time conversion utilities for the realtime counter

+ * @{

+ */

+/**

+ * @brief   Seconds to realtime counter.

+ * @details Converts from seconds to realtime counter cycles.

+ * @note    The macro assumes that @p freq >= @p 1.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] sec       number of seconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define S2RTC(freq, sec) ((freq) * (sec))

+

+/**

+ * @brief   Milliseconds to realtime counter.

+ * @details Converts from milliseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next millisecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] msec      number of milliseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define MS2RTC(freq, msec) (rtcnt_t)((((freq) + 999UL) / 1000UL) * (msec))

+

+/**

+ * @brief   Microseconds to realtime counter.

+ * @details Converts from microseconds to realtime counter cycles.

+ * @note    The result is rounded upward to the next microsecond boundary.

+ * @note    The macro assumes that @p freq >= @p 1000000.

+ *

+ * @param[in] freq      clock frequency, in Hz, of the realtime counter

+ * @param[in] usec      number of microseconds

+ * @return              The number of cycles.

+ *

+ * @api

+ */

+#define US2RTC(freq, usec) (rtcnt_t)((((freq) + 999999UL) / 1000000UL) * (usec))

+/** @} */

+

+/**

  * @name    Macro Functions

  * @{

  */

 /**

+ * @brief   Returns the current value of the system real time counter.

+ * @note    This function is only available if the port layer supports the

+ *          option @p PORT_SUPPORTS_RT.

+ *

+ * @return              The value of the system realtime counter of

+ *                      type rtcnt_t.

+ *

+ * @xclass

+ */

+#if (PORT_SUPPORTS_RT == TRUE) || defined(__DOXYGEN__)

+#define chSysGetRealtimeCounterX() (rtcnt_t)port_rt_get_counter_value()

+#endif

+

+/**

  * @brief   Enters the kernel lock mode.

  *

  * @special

@@ -912,6 +972,8 @@ extern "C" {
   void chSysUnconditionalLock(void);

   void chSysUnconditionalUnlock(void);

   syssts_t chSysGetStatusAndLockX(void);

+  bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end);

+  void chSysPolledDelayX(rtcnt_t cycles);

   void chSysRestoreStatusX(syssts_t sts);

   thread_t *chSchReadyI(thread_t *tp, msg_t msg);

   void chSchRescheduleS(void);

diff --git a/os/nil/ports/ARMCMx/nilcore_v7m.h b/os/nil/ports/ARMCMx/nilcore_v7m.h
index ae030c273..4ae692d7d 100644
--- a/os/nil/ports/ARMCMx/nilcore_v7m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v7m.h
@@ -35,7 +35,7 @@
 /**

  * @brief   This port supports a realtime counter.

  */

-#define PORT_SUPPORTS_RT                FALSE //TRUE

+#define PORT_SUPPORTS_RT                TRUE

 

 /**

  * @brief   Disabled value for BASEPRI register.

diff --git a/os/nil/src/nil.c b/os/nil/src/nil.c
index 9254acbc0..7d3dab9ce 100644
--- a/os/nil/src/nil.c
+++ b/os/nil/src/nil.c
@@ -306,6 +306,50 @@ void chSysRestoreStatusX(syssts_t sts) {
   }

 }

 

+#if (PORT_SUPPORTS_RT == TRUE) || defined(__DOXYGEN__)

+/**

+ * @brief   Realtime window test.

+ * @details This function verifies if the current realtime counter value

+ *          lies within the specified range or not. The test takes care

+ *          of the realtime counter wrapping to zero on overflow.

+ * @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 PORT_SUPPORTS_RT.

+ *

+ * @param[in] cnt       the counter value to be tested

+ * @param[in] start     the start of the time window (inclusive)

+ * @param[in] end       the end of the time window (non inclusive)

+ * @retval true         current time within the specified time window.

+ * @retval false        current time not within the specified time window.

+ *

+ * @xclass

+ */

+bool chSysIsCounterWithinX(rtcnt_t cnt, rtcnt_t start, rtcnt_t end) {

+

+  return (bool)((cnt - start) < (end - start));

+}

+

+/**

+ * @brief   Polled delay.

+ * @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 PORT_SUPPORTS_RT.

+ *

+ * @param[in] cycles    number of cycles

+ *

+ * @xclass

+ */

+void chSysPolledDelayX(rtcnt_t cycles) {

+  rtcnt_t start = chSysGetRealtimeCounterX();

+  rtcnt_t end  = start + cycles;

+

+  while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end)) {

+  }

+}

+#endif /* PORT_SUPPORTS_RT == TRUE */

+

 /**

  * @brief   Makes the specified thread ready for execution.

  *

diff --git a/readme.txt b/readme.txt
index 5ef86f8d0..e454ae5af 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,7 @@
 *****************************************************************************

 

 *** 3.1.0 ***

+- NIL: Added polled delays required to fix bug #629.

 - HAL: Added support for I2C3 and I2C4 to the STM32 I2Cv2 I2C driver.

 - HAL: Added support for SPI4...SPI6 to the STM32 SPIv2 SPI driver.

 - HAL: Added support for UART4...UART8 to the STM32 UARTv2 UART driver.

@@ -94,6 +95,8 @@
 - HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.

 - HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support

        for STM32F030xC, STM32F070x6, STM32F070xB devices.

+- HAL: Fixed STM32F3xx ADC driver uses US2RTC directly (bug #629)(backported

+       to 3.0.2).

 - HAL: Fixed CEC clock cannot be disabled on STM32F0xx (bug #628)

        (backported to 3.0.1).

 - VAR: Fixed lwIP arch code breaks with a 16-bit systick timer (bug #627)