diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-30 16:51:43 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-30 16:51:43 +0000 |
| commit | 505963a3568ba0dc23cb0cb7b3efee58f83a49ea (patch) | |
| tree | 41f9e4861aa9914bbcf36241710b609ce1681ba1 /nuttx | |
| parent | e3feaf63eccee5e555ab006d7f8216057cd1e31b (diff) | |
| download | px4-nuttx-505963a3568ba0dc23cb0cb7b3efee58f83a49ea.tar.gz px4-nuttx-505963a3568ba0dc23cb0cb7b3efee58f83a49ea.tar.bz2 px4-nuttx-505963a3568ba0dc23cb0cb7b3efee58f83a49ea.zip | |
Add support for testing multiple ADC, PWM, and QE devices
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4993 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_qencoder.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_pmbuttons.c | 2 |
2 files changed, 4 insertions, 2 deletions
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 |