You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/01/31 14:42:35 UTC
[nuttx] branch master updated (3904fd775a -> 4f957f8031)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 3904fd775a sched: Remove the unused TCB_FLAG_SCHED_OTHER
new 4dd8187afe include/nuttx/clock.h: Change ?SEC2TICK macros to round up and fix nxstyle errors
new 05eb8541d1 Revert "arch/arm/src/stm32f7/stm32_i2c.c: Round up stm32_i2c_toticks return value"
new 4f957f8031 arch/arm/src/lc823450/lc823450_i2c.c: Remove extra rounding after MSEC2TIC change to round up
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/lc823450/lc823450_i2c.c | 2 +-
arch/arm/src/stm32f7/stm32_i2c.c | 7 +++--
include/nuttx/clock.h | 52 +++++++++++++++++++++---------------
3 files changed, 34 insertions(+), 27 deletions(-)
[nuttx] 03/03: arch/arm/src/lc823450/lc823450_i2c.c: Remove extra rounding after MSEC2TIC change to round up
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4f957f8031e96dfb69be864187a0f3bb45217f30
Author: Jukka Laitinen <ju...@ssrc.tii.ae>
AuthorDate: Tue Jan 31 10:28:18 2023 +0400
arch/arm/src/lc823450/lc823450_i2c.c: Remove extra rounding after MSEC2TIC change to round up
Signed-off-by: Jukka Laitinen <ju...@ssrc.tii.ae>
---
arch/arm/src/lc823450/lc823450_i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c
index 69960dd826..b507702cf8 100644
--- a/arch/arm/src/lc823450/lc823450_i2c.c
+++ b/arch/arm/src/lc823450/lc823450_i2c.c
@@ -305,7 +305,7 @@ lc823450_i2c_sem_waitdone(struct lc823450_i2c_priv_s *priv)
/* Get the timeout value */
- timeout = MSEC2TICK(priv->timeoms + (MSEC_PER_TICK / 2));
+ timeout = MSEC2TICK(priv->timeoms);
timeout += SEC2TICK(CONFIG_LC823450_I2C_TIMEOSEC);
/* Signal the interrupt handler that we are waiting. NOTE: Interrupts
[nuttx] 02/03: Revert "arch/arm/src/stm32f7/stm32_i2c.c: Round up stm32_i2c_toticks return value"
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 05eb8541d18454c7732bd8240bddee5ef2e6d2ca
Author: Jukka Laitinen <ju...@ssrc.tii.ae>
AuthorDate: Mon Jan 30 12:15:03 2023 +0400
Revert "arch/arm/src/stm32f7/stm32_i2c.c: Round up stm32_i2c_toticks return value"
This reverts commit fe6f6870dcc431cecf0fa94187cff05ec040cf47.
---
arch/arm/src/stm32f7/stm32_i2c.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 94da6f2321..6a629f6da8 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -784,12 +784,11 @@ static uint32_t stm32_i2c_toticks(int msgc, struct i2c_msg_s *msgs)
bytecount += msgs[i].length;
}
- /* Then return a number of ticks based on a user provided scaling
- * factor, rounded up.
+ /* Then return a number of microseconds based on a user provided scaling
+ * factor.
*/
- return USEC2TICK(CONFIG_STM32F7_I2C_DYNTIMEO_USECPERBYTE * bytecount +
- CONFIG_USEC_PER_TICK / 2 - 1);
+ return USEC2TICK(CONFIG_STM32F7_I2C_DYNTIMEO_USECPERBYTE * bytecount);
}
#endif
[nuttx] 01/03: include/nuttx/clock.h: Change ?SEC2TICK macros to round up and fix nxstyle errors
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4dd8187afee4dcd92a7af00dc91f7e6515941b9a
Author: Jukka Laitinen <ju...@ssrc.tii.ae>
AuthorDate: Mon Jan 30 12:13:16 2023 +0400
include/nuttx/clock.h: Change ?SEC2TICK macros to round up and fix nxstyle errors
Signed-off-by: Jukka Laitinen <ju...@ssrc.tii.ae>
---
include/nuttx/clock.h | 52 +++++++++++++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h
index 3a641c144f..0ca726e0ce 100644
--- a/include/nuttx/clock.h
+++ b/include/nuttx/clock.h
@@ -145,41 +145,49 @@
* preferred for that reason (at the risk of overflow)
*/
-#define TICK_PER_HOUR (USEC_PER_HOUR / USEC_PER_TICK) /* Truncates! */
-#define TICK_PER_MIN (USEC_PER_MIN / USEC_PER_TICK) /* Truncates! */
-#define TICK_PER_SEC (USEC_PER_SEC / USEC_PER_TICK) /* Truncates! */
-#define TICK_PER_MSEC (USEC_PER_MSEC / USEC_PER_TICK) /* Truncates! */
-#define TICK_PER_DSEC (USEC_PER_DSEC / USEC_PER_TICK) /* Truncates! */
-#define TICK_PER_HSEC (USEC_PER_HSEC / USEC_PER_TICK) /* Truncates! */
+/* TICK_PER_* truncates! */
-#define MSEC_PER_TICK (USEC_PER_TICK / USEC_PER_MSEC) /* Truncates! */
-#define NSEC_PER_TICK (USEC_PER_TICK * NSEC_PER_USEC) /* Exact */
+#define TICK_PER_HOUR (USEC_PER_HOUR / USEC_PER_TICK)
+#define TICK_PER_MIN (USEC_PER_MIN / USEC_PER_TICK)
+#define TICK_PER_SEC (USEC_PER_SEC / USEC_PER_TICK)
+#define TICK_PER_MSEC (USEC_PER_MSEC / USEC_PER_TICK)
+#define TICK_PER_DSEC (USEC_PER_DSEC / USEC_PER_TICK)
+#define TICK_PER_HSEC (USEC_PER_HSEC / USEC_PER_TICK)
-#define NSEC2TICK(nsec) (((nsec)+(NSEC_PER_TICK/2))/NSEC_PER_TICK) /* Rounds */
-#define USEC2TICK(usec) (((usec)+(USEC_PER_TICK/2))/USEC_PER_TICK) /* Rounds */
+/* MSEC_PER_TICK truncates! */
+
+#define MSEC_PER_TICK (USEC_PER_TICK / USEC_PER_MSEC)
+#define NSEC_PER_TICK (USEC_PER_TICK * NSEC_PER_USEC)
+
+/* ?SEC2TIC rounds up */
+
+#define NSEC2TICK(nsec) (((nsec) + (NSEC_PER_TICK - 1)) / NSEC_PER_TICK)
+#define USEC2TICK(usec) (((usec) + (USEC_PER_TICK - 1)) / USEC_PER_TICK)
#if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK
-# define MSEC2TICK(msec) (((msec)+(MSEC_PER_TICK/2))/MSEC_PER_TICK) /* Rounds */
+# define MSEC2TICK(msec) (((msec) + (MSEC_PER_TICK - 1)) / MSEC_PER_TICK)
#else
-# define MSEC2TICK(msec) USEC2TICK((msec) * USEC_PER_MSEC) /* Rounds */
+# define MSEC2TICK(msec) USEC2TICK((msec) * USEC_PER_MSEC)
#endif
-#define DSEC2TICK(dsec) MSEC2TICK((dsec) * MSEC_PER_DSEC) /* Rounds */
-#define HSEC2TICK(dsec) MSEC2TICK((dsec) * MSEC_PER_HSEC) /* Rounds */
-#define SEC2TICK(sec) MSEC2TICK((sec) * MSEC_PER_SEC) /* Rounds */
+#define DSEC2TICK(dsec) MSEC2TICK((dsec) * MSEC_PER_DSEC)
+#define HSEC2TICK(dsec) MSEC2TICK((dsec) * MSEC_PER_HSEC)
+#define SEC2TICK(sec) MSEC2TICK((sec) * MSEC_PER_SEC)
-#define TICK2NSEC(tick) ((tick) * NSEC_PER_TICK) /* Exact */
-#define TICK2USEC(tick) ((tick) * USEC_PER_TICK) /* Exact */
+#define TICK2NSEC(tick) ((tick) * NSEC_PER_TICK)
+#define TICK2USEC(tick) ((tick) * USEC_PER_TICK)
#if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK
-# define TICK2MSEC(tick) ((tick)*MSEC_PER_TICK) /* Exact */
+# define TICK2MSEC(tick) ((tick) * MSEC_PER_TICK)
#else
-# define TICK2MSEC(tick) (((tick)*USEC_PER_TICK)/USEC_PER_MSEC) /* Rounds */
+# define TICK2MSEC(tick) (((tick) * USEC_PER_TICK) / USEC_PER_MSEC)
#endif
-#define TICK2DSEC(tick) (((tick)+(TICK_PER_DSEC/2))/TICK_PER_DSEC) /* Rounds */
-#define TICK2HSEC(tick) (((tick)+(TICK_PER_HSEC/2))/TICK_PER_HSEC) /* Rounds */
-#define TICK2SEC(tick) (((tick)+(TICK_PER_SEC/2))/TICK_PER_SEC) /* Rounds */
+/* TIC2?SEC rounds to nearest */
+
+#define TICK2DSEC(tick) (((tick) + (TICK_PER_DSEC / 2)) / TICK_PER_DSEC)
+#define TICK2HSEC(tick) (((tick) + (TICK_PER_HSEC / 2)) / TICK_PER_HSEC)
+#define TICK2SEC(tick) (((tick) + (TICK_PER_SEC / 2)) / TICK_PER_SEC)
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SYSTEM_TIME64) && \
!defined(CONFIG_SCHED_TICKLESS)