From cb77f5961df901626b4f4cb3e1d5672f6a94b5f3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 30 Jul 2012 16:51:43 +0000 Subject: Add support for testing multiple ADC, PWM, and QE devices git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4993 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_qencoder.c | 4 +++- nuttx/configs/stm3210e-eval/src/up_pmbuttons.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'nuttx') diff --git a/nuttx/arch/arm/src/stm32/stm32_qencoder.c b/nuttx/arch/arm/src/stm32/stm32_qencoder.c index 237782c15..8553296f9 100644 --- a/nuttx/arch/arm/src/stm32/stm32_qencoder.c +++ b/nuttx/arch/arm/src/stm32/stm32_qencoder.c @@ -124,7 +124,7 @@ /* 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) || \ -# 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 # endif @@ -734,8 +734,10 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) uint16_t ccmr1; uint16_t ccer; uint16_t cr1; +#ifdef HAVE_16BIT_TIMERS uint16_t regval; int ret; +#endif /* NOTE: Clocking should have been enabled in the low-level RCC logic at boot-up */ diff --git a/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c b/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c index 35a98a00a..c0f16ee8c 100644 --- a/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c +++ b/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c @@ -187,9 +187,9 @@ static const xcpt_t g_buttonhandlers[NUM_PMBUTTONS] = #endif #if MAX_BUTTON > 6 button7_handler, - } #endif }; +#endif /* CONFIG_ARCH_IRQBUTTONS */ /**************************************************************************** * Private Functions -- cgit v1.2.3