You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/26 17:35:20 UTC
[incubator-nuttx] 01/09: arch/arm/src/stm32/stm32_adc.c: move
adc_offset_set to llops section
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4cb8be9608805c5358b66c9b863fc7129db09a53
Author: raiden00pl <ra...@railab.me>
AuthorDate: Tue Apr 21 21:31:27 2020 +0200
arch/arm/src/stm32/stm32_adc.c: move adc_offset_set to llops section
---
arch/arm/src/stm32/stm32_adc.c | 124 ++++++++++++++++++++---------------------
1 file changed, 61 insertions(+), 63 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index a3aa130..5ac3b58 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -3694,69 +3694,6 @@ static uint32_t adc_sqrbits(FAR struct stm32_dev_s *priv, int first,
}
/****************************************************************************
- * Name: adc_offset_set
- ****************************************************************************/
-
-#ifdef CONFIG_STM32_ADC_LL_OPS
-#ifdef HAVE_IP_ADC_V2
-static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
- uint8_t i, uint16_t offset)
-{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
- uint32_t regval = 0;
- uint32_t reg = 0;
- int ret = OK;
-
- if (i >= 4)
- {
- /* There are only four offset registers. */
-
- ret = -E2BIG;
- goto errout;
- }
-
- reg = STM32_ADC_OFR1_OFFSET + i * 4;
-
- regval = ADC_OFR_OFFSETY_EN;
- adc_putreg(priv, reg, regval);
-
- regval |= ADC_OFR_OFFSETY_CH(ch) | ADC_OFR_OFFSETY(offset);
- adc_putreg(priv, reg, regval);
-
-errout:
- return ret;
-}
-#else /* HAVE_IP_ADC_V1 */
-static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
- uint8_t i, uint16_t offset)
-{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
- uint32_t reg = 0;
- int ret = OK;
-
- /* WARNING: Offset only for injected channels! */
-
- UNUSED(ch);
-
- if (i >= 4)
- {
- /* There are only four offset registers. */
-
- ret = -E2BIG;
- goto errout;
- }
-
- reg = STM32_ADC_JOFR1_OFFSET + i * 4;
-
- adc_putreg(priv, reg, offset);
-
-errout:
- return ret;
-}
-#endif
-#endif /* CONFIG_STM32_ADC_LL_OPS */
-
-/****************************************************************************
* Name: adc_set_ch
*
* Description:
@@ -4325,6 +4262,67 @@ static void adc_llops_reg_startconv(FAR struct stm32_adc_dev_s *dev,
}
/****************************************************************************
+ * Name: adc_offset_set
+ ****************************************************************************/
+
+#ifdef HAVE_IP_ADC_V2
+static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
+ uint8_t i, uint16_t offset)
+{
+ FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ uint32_t regval = 0;
+ uint32_t reg = 0;
+ int ret = OK;
+
+ if (i >= 4)
+ {
+ /* There are only four offset registers. */
+
+ ret = -E2BIG;
+ goto errout;
+ }
+
+ reg = STM32_ADC_OFR1_OFFSET + i * 4;
+
+ regval = ADC_OFR_OFFSETY_EN;
+ adc_putreg(priv, reg, regval);
+
+ regval |= ADC_OFR_OFFSETY_CH(ch) | ADC_OFR_OFFSETY(offset);
+ adc_putreg(priv, reg, regval);
+
+errout:
+ return ret;
+}
+#else /* HAVE_IP_ADC_V1 */
+static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
+ uint8_t i, uint16_t offset)
+{
+ FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ uint32_t reg = 0;
+ int ret = OK;
+
+ /* WARNING: Offset only for injected channels! */
+
+ UNUSED(ch);
+
+ if (i >= 4)
+ {
+ /* There are only four offset registers. */
+
+ ret = -E2BIG;
+ goto errout;
+ }
+
+ reg = STM32_ADC_JOFR1_OFFSET + i * 4;
+
+ adc_putreg(priv, reg, offset);
+
+errout:
+ return ret;
+}
+#endif
+
+/****************************************************************************
* Name: adc_regbufregister
****************************************************************************/