You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/05/03 18:58:00 UTC
[incubator-nuttx] 04/07: arch/arm/src/stm32/stm32_adc.c:
setup/shutdown ADC instance only once
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5857c48b2ea940889d3c6526e77d49ec38266039
Author: raiden00pl <ra...@railab.me>
AuthorDate: Mon Apr 27 19:51:21 2020 +0200
arch/arm/src/stm32/stm32_adc.c: setup/shutdown ADC instance only once
---
arch/arm/src/stm32/stm32_adc.c | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index b05e1f6..5a77dfc 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -409,6 +409,7 @@ struct stm32_dev_s
uint8_t cj_channels; /* Number of configured injected channels */
#endif
uint8_t intf; /* ADC interface number */
+ uint8_t initialized; /* ADC interface initialization counter */
uint8_t current; /* Current ADC channel being converted */
#ifdef HAVE_ADC_RESOLUTION
uint8_t resolution; /* ADC resolution (0-3) */
@@ -755,6 +756,7 @@ static struct stm32_dev_s g_adcpriv1 =
.cmn = &ADC1CMN_DATA,
#endif
.intf = 1,
+ .initialized = 0,
#ifdef HAVE_ADC_RESOLUTION
.resolution = CONFIG_STM32_ADC1_RESOLUTION,
#endif
@@ -810,6 +812,7 @@ static struct stm32_dev_s g_adcpriv2 =
.cmn = &ADC2CMN_DATA,
#endif
.intf = 2,
+ .initialized = 0,
#ifdef HAVE_ADC_RESOLUTION
.resolution = CONFIG_STM32_ADC2_RESOLUTION,
#endif
@@ -865,6 +868,7 @@ static struct stm32_dev_s g_adcpriv3 =
.cmn = &ADC3CMN_DATA,
#endif
.intf = 3,
+ .initialized = 0,
#ifdef HAVE_ADC_RESOLUTION
.resolution = CONFIG_STM32_ADC3_RESOLUTION,
#endif
@@ -913,6 +917,7 @@ static struct stm32_dev_s g_adcpriv4 =
.cmn = &ADC4CMN_DATA,
#endif
.intf = 4,
+ .initialized = 0,
#ifdef HAVE_ADC_RESOLUTION
.resolution = CONFIG_STM32_ADC4_RESOLUTION,
#endif
@@ -2793,6 +2798,13 @@ static void adc_reset(FAR struct adc_dev_s *dev)
ainfo("intf: %d\n", priv->intf);
flags = enter_critical_section();
+ /* Do nothing if ADC instance is currently in use */
+
+ if (priv->initialized > 0)
+ {
+ return;
+ }
+
#ifdef HAVE_HSI_CONTROL
/* The STM32L15XX family uses HSI as an independent clock-source
* for the ADC
@@ -2874,12 +2886,18 @@ static void adc_reset_hsi_disable(FAR struct adc_dev_s *dev)
static int adc_setup(FAR struct adc_dev_s *dev)
{
-#if !defined(CONFIG_STM32_ADC_NOIRQ) || defined(HAVE_ADC_CMN_DATA) || \
- defined(ADC_HAVE_TIMER) || !defined(CONFIG_STM32_ADC_NO_STARTUP_CONV)
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
-#endif
int ret = OK;
+ /* Do nothing when the ADC device is already set up */
+
+ if (priv->initialized > 0)
+ {
+ return OK;
+ }
+
+ priv->initialized += 1;
+
/* Attach the ADC interrupt */
#ifndef CONFIG_STM32_ADC_NOIRQ
@@ -2972,6 +2990,15 @@ static void adc_shutdown(FAR struct adc_dev_s *dev)
{
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ /* Shutdown the ADC device only when not in use */
+
+ priv->initialized -= 1;
+
+ if (priv->initialized > 0)
+ {
+ return;
+ }
+
/* Disable ADC */
adc_enable(priv, false);