Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stm32/mikroe-stm32f4: Fix the several macros undefine issue

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-04-29 11:43:27 +08:00
committed by patacongo
parent 01ad7a82a3
commit ed2b56799a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
+7 -5
View File
@@ -113,6 +113,10 @@
# define CONFIG_TOUCHSCREEN_AVG_SAMPLES 2 # define CONFIG_TOUCHSCREEN_AVG_SAMPLES 2
#endif #endif
#ifndef CONFIG_TOUCHSCREEN_NPOLLWAITERS
# define CONFIG_TOUCHSCREEN_NPOLLWAITERS 2
#endif
/* Driver support *******************************************************************/ /* Driver support *******************************************************************/
/* This format is used to construct the /dev/input[n] device driver path. It is /* This format is used to construct the /dev/input[n] device driver path. It is
* defined here so that it will be used consistently in all places. * defined here so that it will be used consistently in all places.
@@ -442,7 +446,7 @@ static void tc_adc_init(void)
regval = getreg32(STM32_ADC_CCR); regval = getreg32(STM32_ADC_CCR);
regval &= ~(ADC_CCR_MULTI_MASK | ADC_CCR_DELAY_MASK | ADC_CCR_DDS | ADC_CCR_DMA_MASK | regval &= ~(ADC_CCR_MULTI_MASK | ADC_CCR_DELAY_MASK | ADC_CCR_DDS | ADC_CCR_DMA_MASK |
ADC_CCR_ADCPRE_MASK | ADC_CCR_VBATE | ADC_CCR_TSVREFE); ADC_CCR_ADCPRE_MASK | ADC_CCR_VBATEN | ADC_CCR_TSVREFE);
regval |= (ADC_CCR_MULTI_NONE | ADC_CCR_DMA_DISABLED | ADC_CCR_ADCPRE_DIV2); regval |= (ADC_CCR_MULTI_NONE | ADC_CCR_DMA_DISABLED | ADC_CCR_ADCPRE_DIV2);
putreg32(regval, STM32_ADC_CCR); putreg32(regval, STM32_ADC_CCR);
@@ -520,7 +524,7 @@ static uint16_t tc_adc_read_sample(void)
/* Read the sample */ /* Read the sample */
retval = tc_adc_getreg(STM32_ADC_DR_OFFSET); retval = tc_adc_getreg(STM32_ADC_DR_OFFSET);
retval &= ADC_DR_DATA_MASK; retval &= ADC_DR_RDATA_MASK;
if (count > 0) if (count > 0)
{ {
@@ -738,7 +742,6 @@ static void tc_worker(FAR void *arg)
uint16_t newx = 0; uint16_t newx = 0;
int16_t xdiff; int16_t xdiff;
int16_t ydiff; int16_t ydiff;
int ret;
DEBUGASSERT(priv != NULL); DEBUGASSERT(priv != NULL);
@@ -1087,8 +1090,7 @@ static void tc_worker(FAR void *arg)
/* Set up the next sample event */ /* Set up the next sample event */
ret = work_queue(HPWORK, &priv->work, tc_worker, priv, delay); work_queue(HPWORK, &priv->work, tc_worker, priv, delay);
DEBUGASSERT(ret == 0);
} }
/**************************************************************************** /****************************************************************************