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 2020/10/21 05:37:10 UTC

[incubator-nuttx] 02/02: kinetis: Make kinetis_i2c_sem_wait_noncancelable optional

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/incubator-nuttx.git

commit 271016a3ade7a38787f7660b9265ce332c2e94e6
Author: Philippe Coval <rz...@users.sf.net>
AuthorDate: Tue Oct 20 20:50:52 2020 +0200

    kinetis: Make kinetis_i2c_sem_wait_noncancelable optional
    
    CONFIG_I2C_RESET is coming from imxrt_lpi2c.c
    
    Change-Id: I8f55eaf793386fe5ac1d4adaf310d6e0f08dcd92
    Bug: https://github.com/apache/incubator-nuttx/pull/1999
    Forwarded: https://github.com/apache/incubator-nuttx/pulls/rzr
    Signed-off-by: Philippe Coval <rz...@users.sf.net>
---
 arch/arm/src/kinetis/kinetis_i2c.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c
index 0abf9d6..fe3806d 100644
--- a/arch/arm/src/kinetis/kinetis_i2c.c
+++ b/arch/arm/src/kinetis/kinetis_i2c.c
@@ -152,8 +152,12 @@ static inline void kinetis_i2c_sem_init(FAR struct kinetis_i2cdev_s *priv);
 static inline void
   kinetis_i2c_sem_destroy(FAR struct kinetis_i2cdev_s *priv);
 static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv);
+
+#ifdef CONFIG_I2C_RESET
 static int
   kinetis_i2c_sem_wait_noncancelable(FAR struct kinetis_i2cdev_s *priv);
+#endif
+
 static inline void kinetis_i2c_sem_post(struct kinetis_i2cdev_s *priv);
 
 /* Signal Helper */
@@ -363,6 +367,7 @@ static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv)
   return nxsem_wait(&priv->mutex);
 }
 
+#ifdef CONFIG_I2C_RESET
 /****************************************************************************
  * Name: kinetis_i2c_sem_wait_noncancelable
  *
@@ -376,6 +381,7 @@ static int
 {
   return nxsem_wait_uninterruptible(&priv->mutex);
 }
+#endif
 
 /****************************************************************************
  * Name: kinetis_i2c_sem_post