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

sama5d3x-ek/nxwm: Fix error: 'g_adcdev' undeclared

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-04-30 01:46:22 +08:00 committed by patacongo
parent 1692c90d15
commit 5d12735f34
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/src/sama5/sam_adc.c
View File

@ -500,11 +500,9 @@ static const struct adc_ops_s g_adcops =
static struct sam_adc_s g_adcpriv; static struct sam_adc_s g_adcpriv;
#ifdef SAMA5_ADC_HAVE_CHANNELS
/* ADC device instance */ /* ADC device instance */
static struct adc_dev_s g_adcdev; static struct adc_dev_s g_adcdev;
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -677,7 +675,7 @@ static void sam_adc_dmadone(void *arg)
ADC_LCDR_CHANB_SHIFT); ADC_LCDR_CHANB_SHIFT);
sample = ((*buffer & ADC_LCDR_DATA_MASK) >> ADC_LCDR_DATA_SHIFT); sample = ((*buffer & ADC_LCDR_DATA_MASK) >> ADC_LCDR_DATA_SHIFT);
/* Verify that the upper-half driver has bound its callback functions */ /* Verify the upper-half driver has bound its callback functions */
if (priv->cb != NULL) if (priv->cb != NULL)
{ {
@ -884,7 +882,7 @@ static void sam_adc_endconversion(void *arg)
regval = sam_adc_getreg(priv, SAM_ADC_CDR(chan)); regval = sam_adc_getreg(priv, SAM_ADC_CDR(chan));
/* Verify that the upper-half driver has bound its callback functions */ /* Verify the upper-half driver has bound its callback functions */
if (priv->cb != NULL) if (priv->cb != NULL)
{ {
@ -2033,14 +2031,17 @@ struct adc_dev_s *sam_adc_initialize(void)
/* Initialize the public ADC device data structure */ /* Initialize the public ADC device data structure */
#ifdef SAMA5_ADC_HAVE_CHANNELS
g_adcdev.ad_ops = &g_adcops; g_adcdev.ad_ops = &g_adcops;
priv->dev = &g_adcdev;
#endif
g_adcdev.ad_priv = priv; g_adcdev.ad_priv = priv;
/* Initialize the private ADC device data structure */ /* Initialize the private ADC device data structure */
nxsem_init(&priv->exclsem, 0, 1); nxsem_init(&priv->exclsem, 0, 1);
priv->cb = NULL; priv->cb = NULL;
priv->dev = &g_adcdev;
#ifdef CONFIG_SAMA5_ADC_DMA #ifdef CONFIG_SAMA5_ADC_DMA
/* Allocate a DMA channel from DMAC1 */ /* Allocate a DMA channel from DMAC1 */

2
boards/arm/sama5/sama5d3x-ek/src/sam_touchscreen.c
View File

@ -96,7 +96,7 @@ int sam_tsc_setup(int minor)
/* Initialize the ADC driver */ /* Initialize the ADC driver */
adc = sam_adc_initialize(); adc = (struct sam_adc_s *)sam_adc_initialize();
if (!adc) if (!adc)
{ {
ierr("ERROR: Failed to initialize the ADC driver\n"); ierr("ERROR: Failed to initialize the ADC driver\n");