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/11/22 18:38:20 UTC
[incubator-nuttx] branch master updated: stm32/stm32_capture.c: Fix
nxstyle errors
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
The following commit(s) were added to refs/heads/master by this push:
new af0dcd4 stm32/stm32_capture.c: Fix nxstyle errors
af0dcd4 is described below
commit af0dcd4a0cda00ca96e5ed3318590a9fa37fb75f
Author: Nathan Hartman <59...@users.noreply.github.com>
AuthorDate: Sun Nov 22 12:25:24 2020 -0500
stm32/stm32_capture.c: Fix nxstyle errors
arch/arm/src/stm32/stm32_capture.c:
* Fix nxstyle errors.
---
arch/arm/src/stm32/stm32_capture.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c
index d31a355..ffd3140 100644
--- a/arch/arm/src/stm32/stm32_capture.c
+++ b/arch/arm/src/stm32/stm32_capture.c
@@ -321,7 +321,7 @@ static inline uint32_t stm32_cap_gpio(FAR const struct stm32_cap_priv_s *priv,
break;
#endif
-/* TIM6 and TIM7 cannot be used in capture */
+ /* TIM6 and TIM7 cannot be used in capture */
#ifdef CONFIG_STM32_TIM8_CAP
case STM32_TIM8_BASE:
@@ -519,6 +519,7 @@ static inline uint32_t stm32_cap_gpio(FAR const struct stm32_cap_priv_s *priv,
break;
#endif
}
+
return 0;
}
@@ -623,6 +624,7 @@ static inline int stm32_cap_set_rcc(FAR const struct stm32_cap_priv_s *priv,
return OK;
}
+
/************************************************************************************
* Basic Functions
************************************************************************************/
@@ -731,6 +733,7 @@ static int stm32_cap_setisr(FAR struct stm32_cap_dev_s *dev, xcpt_t handler,
irq_detach(irq_of);
}
#endif
+
return OK;
}
@@ -902,7 +905,6 @@ static stm32_cap_flags_t stm32_cap_getflags(FAR struct stm32_cap_dev_s *dev)
}
return flags;
-
}
/************************************************************************************
@@ -1015,7 +1017,8 @@ static int stm32_cap_setchannel(FAR struct stm32_cap_dev_s *dev, uint8_t channel
return OK;
}
-static uint32_t stm32_cap_getcapture(FAR struct stm32_cap_dev_s *dev, uint8_t channel)
+static uint32_t stm32_cap_getcapture(FAR struct stm32_cap_dev_s *dev,
+ uint8_t channel)
{
const struct stm32_cap_priv_s *priv = (const struct stm32_cap_priv_s *)dev;
uint32_t offset;