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

Add support for testing multiple ADC, PWM, and QE devices

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4993 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-07-30 16:51:43 +00:00
parent 16f275058e
commit 1702fded40
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/stm32/stm32_qencoder.c
View File

@ -124,7 +124,7 @@
/* If TIM1,3,4, or 8 are enabled, then we have 16-bit timers */ /* If TIM1,3,4, or 8 are enabled, then we have 16-bit timers */
# if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM3_QE) || \ # if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM3_QE) || \
# defined(CONFIG_STM32_TIM4_QE) || defined(CONFIG_STM32_TIM8_QE) defined(CONFIG_STM32_TIM4_QE) || defined(CONFIG_STM32_TIM8_QE)
# define HAVE_16BIT_TIMERS 1 # define HAVE_16BIT_TIMERS 1
# endif # endif
@ -734,8 +734,10 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower)
uint16_t ccmr1; uint16_t ccmr1;
uint16_t ccer; uint16_t ccer;
uint16_t cr1; uint16_t cr1;
#ifdef HAVE_16BIT_TIMERS
uint16_t regval; uint16_t regval;
int ret; int ret;
#endif
/* NOTE: Clocking should have been enabled in the low-level RCC logic at boot-up */ /* NOTE: Clocking should have been enabled in the low-level RCC logic at boot-up */