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

Adds low level function to allow external event configuration for regular group.

Browse Source
This commit is contained in:
Daniel P. Carvalho 2020-10-30 10:37:20 -03:00 committed by Xiang Xiao
parent cfc0aaea2b
commit aa4be3ccfd
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/src/stm32l4/stm32l4_adc.c
View File

@ -315,8 +315,8 @@ static void adc_dmaconvcallback(DMA_HANDLE handle, uint8_t isr,
static int adc_offset_set(FAR struct stm32_dev_s *priv, uint8_t ch, static int adc_offset_set(FAR struct stm32_dev_s *priv, uint8_t ch,
uint8_t i, uint16_t offset); uint8_t i, uint16_t offset);
#endif #endif
#ifdef ADC_HAVE_EXTCFG #if defined(ADC_HAVE_EXTCFG) || defined(CONFIG_STM32L4_ADC_LL_OPS)
static int adc_extsel_set(FAR struct adc_dev_s *dev, uint32_t extcfg); static int adc_extsel_set(FAR struct stm32_dev_s *priv, uint32_t extcfg);
#endif #endif
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int adc_pm_prepare(struct pm_callback_s *cb, int domain, static int adc_pm_prepare(struct pm_callback_s *cb, int domain,
@ -339,6 +339,8 @@ static int adc_llops_offset_set(FAR struct stm32_adc_dev_s *dev,
static int adc_regbufregister(FAR struct stm32_adc_dev_s *dev, static int adc_regbufregister(FAR struct stm32_adc_dev_s *dev,
uint16_t *buffer, uint8_t len); uint16_t *buffer, uint8_t len);
# endif # endif
static int adc_llops_extsel_set(FAR struct stm32_adc_dev_s *dev,
uint32_t extcfg);
static void adc_llops_dumpregs(FAR struct stm32_adc_dev_s *dev); static void adc_llops_dumpregs(FAR struct stm32_adc_dev_s *dev);
#endif /* CONFIG_STM32L4_ADC_LL_OPS */ #endif /* CONFIG_STM32L4_ADC_LL_OPS */
@ -395,6 +397,7 @@ static const struct stm32_adc_ops_s g_adc_llops =
# ifdef ADC_HAVE_DMA # ifdef ADC_HAVE_DMA
.regbuf_reg = adc_regbufregister, .regbuf_reg = adc_regbufregister,
# endif # endif
.extsel_set = adc_llops_extsel_set,
.dump_regs = adc_llops_dumpregs .dump_regs = adc_llops_dumpregs
}; };
#endif /* CONFIG_STM32L4_ADC_LL_OPS */ #endif /* CONFIG_STM32L4_ADC_LL_OPS */
@ -1376,7 +1379,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
static int adc_setup(FAR struct adc_dev_s *dev) static int adc_setup(FAR struct adc_dev_s *dev)
{ {
#if !defined(CONFIG_STM32L4_ADC_NOIRQ) || defined(ADC_HAVE_TIMER) || \ #if !defined(CONFIG_STM32L4_ADC_NOIRQ) || defined(ADC_HAVE_TIMER) || \
!defined(CONFIG_STM32L4_ADC_NO_STARTUP_CONV) !defined(CONFIG_STM32L4_ADC_NO_STARTUP_CONV) || defined(HAVE_ADC_RESOLUTION)
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv; FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
#endif #endif
int ret = OK; int ret = OK;
@ -1461,7 +1464,7 @@ static int adc_setup(FAR struct adc_dev_s *dev)
if (priv->cchannels > 0) if (priv->cchannels > 0)
{ {
adc_extsel_set(dev, priv->extcfg); adc_extsel_set(priv, priv->extcfg);
} }
else else
{ {
@ -1627,10 +1630,9 @@ static void adc_sample_time_set(FAR struct adc_dev_s *dev)
* Name: adc_extsel_set * Name: adc_extsel_set
*****************************************************************************/ *****************************************************************************/
#ifdef ADC_HAVE_EXTCFG #if defined(ADC_HAVE_EXTCFG) || defined(CONFIG_STM32L4_ADC_LL_OPS)
static int adc_extsel_set(FAR struct adc_dev_s *dev, uint32_t extcfg) static int adc_extsel_set(FAR struct stm32_dev_s *priv, uint32_t extcfg)
{ {
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
uint32_t exten = 0; uint32_t exten = 0;
uint32_t extsel = 0; uint32_t extsel = 0;
uint32_t setbits = 0; uint32_t setbits = 0;
@ -2362,6 +2364,20 @@ static int adc_regbufregister(FAR struct stm32_adc_dev_s *dev,
} }
#endif /* ADC_HAVE_DMA */ #endif /* ADC_HAVE_DMA */
/*****************************************************************************
* Name: adc_llops_extsel_set
*****************************************************************************/
static int adc_llops_extsel_set(FAR struct stm32_adc_dev_s *dev,
uint32_t extcfg)
{
int ret;
ret = adc_extsel_set((FAR struct stm32_dev_s *)dev, extcfg);
return ret;
}
/***************************************************************************** /*****************************************************************************
* Name: adc_llops_dumpregs * Name: adc_llops_dumpregs
*****************************************************************************/ *****************************************************************************/

8
arch/arm/src/stm32l4/stm32l4_adc.h
View File

@ -776,6 +776,8 @@
(adc)->llops->reg_startconv(adc, state) (adc)->llops->reg_startconv(adc, state)
#define ADC_OFFSET_SET(adc, ch, i, o) \ #define ADC_OFFSET_SET(adc, ch, i, o) \
(adc)->llops->offset_set(adc, ch, i, o) (adc)->llops->offset_set(adc, ch, i, o)
#define ADC_EXTSEL_SET(adc, extcfg) \
(adc)->llops->extsel_set(adc, extcfg)
#define ADC_DUMP_REGS(adc) \ #define ADC_DUMP_REGS(adc) \
(adc)->llops->dump_regs(adc) (adc)->llops->dump_regs(adc)
@ -836,6 +838,12 @@ struct stm32_adc_ops_s
int (*offset_set)(FAR struct stm32_adc_dev_s *dev, uint8_t ch, uint8_t i, int (*offset_set)(FAR struct stm32_adc_dev_s *dev, uint8_t ch, uint8_t i,
uint16_t offset); uint16_t offset);
/* Configure external event for regular group */
int (*extsel_set)(FAR struct stm32_adc_dev_s *dev, uint32_t extcfg);
/* Dump ADC regs */
void (*dump_regs)(FAR struct stm32_adc_dev_s *dev); void (*dump_regs)(FAR struct stm32_adc_dev_s *dev);
}; };