sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32 ADC changes suggested by Max Kriegleder

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-04 06:29:40 -06:00
parent 949cea035c
commit f7350568f3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32/Kconfig
View File

@ -3114,7 +3114,7 @@ config STM32_TIM14_DAC2
endchoice endchoice
menu "ADC Configuration" menu "ADC Configuration"
depends on STM32_ADC1 depends on STM32_ADC
config STM32_ADC1_DMA config STM32_ADC1_DMA
bool "ADC1 DMA" bool "ADC1 DMA"

8
arch/arm/src/stm32/stm32_adc.c
View File

@ -1596,7 +1596,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
DEBUGASSERT(priv->nchannels <= ADC_MAX_CHANNELS_NODMA); DEBUGASSERT(priv->nchannels <= ADC_MAX_CHANNELS_NODMA);
} }
regval |= (((uint32_t)priv->nchannels-1) << ADC_SQR1_L_SHIFT); regval |= (((uint32_t)priv->nchannels - 1) << ADC_SQR1_L_SHIFT);
adc_putreg(priv, STM32_ADC_SQR1_OFFSET, regval); adc_putreg(priv, STM32_ADC_SQR1_OFFSET, regval);
/* Set the channel index of the first conversion */ /* Set the channel index of the first conversion */
@ -2284,6 +2284,7 @@ static int adc_set_ch(FAR struct adc_dev_s *dev, uint8_t ch)
} }
#else #else
priv->nchannels = priv->cchannels;
regval = adc_getreg(priv, STM32_ADC_SQR3_OFFSET) & ADC_SQR3_RESERVED; regval = adc_getreg(priv, STM32_ADC_SQR3_OFFSET) & ADC_SQR3_RESERVED;
for (i = 0, offset = 0; i < priv->nchannels && i < 6; i++, offset += 5) for (i = 0, offset = 0; i < priv->nchannels && i < 6; i++, offset += 5)
{ {
@ -2323,6 +2324,7 @@ static int adc_set_ch(FAR struct adc_dev_s *dev, uint8_t ch)
regval = adc_getreg(priv, STM32_ADC_SQR1_OFFSET) & ADC_SQR1_RESERVED; regval = adc_getreg(priv, STM32_ADC_SQR1_OFFSET) & ADC_SQR1_RESERVED;
regval &= ~(ADC_SQR1_L_MASK); regval &= ~(ADC_SQR1_L_MASK);
adc_putreg(priv, STM32_ADC_SQR1_OFFSET, regval); adc_putreg(priv, STM32_ADC_SQR1_OFFSET, regval);
priv->current = i; priv->current = i;
priv->nchannels = 1; priv->nchannels = 1;
return ret; return ret;
@ -2761,7 +2763,7 @@ void stm32_adcchange_sample_time(FAR struct adc_dev_s *dev,
* Input Parameters: * Input Parameters:
* intf - Could be {1,2,3} for ADC1, ADC2, or ADC3 * intf - Could be {1,2,3} for ADC1, ADC2, or ADC3
* chanlist - The list of channels * chanlist - The list of channels
* nchannels - Number of channels * cchannels - Number of channels
* *
* Returned Value: * Returned Value:
* Valid ADC device structure reference on succcess; a NULL on failure * Valid ADC device structure reference on succcess; a NULL on failure
@ -2774,7 +2776,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, const uint8_t *chanlist,
FAR struct adc_dev_s *dev; FAR struct adc_dev_s *dev;
FAR struct stm32_dev_s *priv; FAR struct stm32_dev_s *priv;
allvdbg("intf: %d nchannels: %d\n", intf, cchannels); allvdbg("intf: %d cchannels: %d\n", intf, cchannels);
#ifdef CONFIG_STM32_ADC1 #ifdef CONFIG_STM32_ADC1
if (intf == 1) if (intf == 1)