Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 03:05:40 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stm32h5/adc: fix TROVS bit and watchdog threshold register writes

Browse Source 
Fix adc_oversample() where priv->trovs (a bool, 0 or 1) was OR'd
directly into setbits instead of using ADC_CFGR2_TROVS (bit 9).
This caused triggered oversampling to never actually be enabled.

Fix ANIOC_WDOG_UPPER and ANIOC_WDOG_LOWER ioctls where the TR1
register was overwritten with only the new threshold value, zeroing
out the opposite threshold and the AWDFILT digital filter bits.
Use read-modify-write to preserve the other fields.

Signed-off-by: kywwilson11 <kwilson@2g-eng.com>
This commit is contained in:
kywwilson11
2026-03-24 15:40:45 -05:00
committed by Xiang Xiao
parent 26a476e0c1
commit c717873ae3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32h5/stm32_adc.c
+8 -3
View File
@@ -1069,7 +1069,10 @@ static void adc_oversample(struct adc_dev_s *dev)
(priv->ovsr << ADC_CFGR2_OVSR_SHIFT) | (priv->ovsr << ADC_CFGR2_OVSR_SHIFT) |
(priv->ovss << ADC_CFGR2_OVSS_SHIFT); (priv->ovss << ADC_CFGR2_OVSS_SHIFT);
setbits |= priv->trovs; if (priv->trovs)
{
setbits |= ADC_CFGR2_TROVS;
}
adc_modifyreg(priv, STM32_ADC_CFGR2_OFFSET, clrbits, setbits); adc_modifyreg(priv, STM32_ADC_CFGR2_OFFSET, clrbits, setbits);
} }
@@ -1811,7 +1814,8 @@ static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg)
/* Set the watchdog threshold register */ /* Set the watchdog threshold register */
regval = ((arg << ADC_TR1_HT1_SHIFT) & ADC_TR1_HT1_MASK); regval &= ~ADC_TR1_HT1_MASK;
regval |= ((arg << ADC_TR1_HT1_SHIFT) & ADC_TR1_HT1_MASK);
adc_putreg(priv, STM32_ADC_TR1_OFFSET, regval); adc_putreg(priv, STM32_ADC_TR1_OFFSET, regval);
/* Ensure analog watchdog is enabled */ /* Ensure analog watchdog is enabled */
@@ -1845,7 +1849,8 @@ static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg)
/* Set the watchdog threshold register */ /* Set the watchdog threshold register */
regval = ((arg << ADC_TR1_LT1_SHIFT) & ADC_TR1_LT1_MASK); regval &= ~ADC_TR1_LT1_MASK;
regval |= ((arg << ADC_TR1_LT1_SHIFT) & ADC_TR1_LT1_MASK);
adc_putreg(priv, STM32_ADC_TR1_OFFSET, regval); adc_putreg(priv, STM32_ADC_TR1_OFFSET, regval);
/* Ensure analog watchdog is enabled */ /* Ensure analog watchdog is enabled */