summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/stm32/stm32_adc.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-07-29 14:50:02 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-07-29 14:50:02 +0000
commitc28168e6888089662f84f65e848797a2d3f73eed (patch)
tree77e5f804f4e375eb10fec291862f331f9a20556d /nuttx/arch/arm/src/stm32/stm32_adc.c
parent16cadcf45159dfa6fa4b57be276cde3c259d83a3 (diff)
downloadpx4-nuttx-c28168e6888089662f84f65e848797a2d3f73eed.tar.gz
px4-nuttx-c28168e6888089662f84f65e848797a2d3f73eed.tar.bz2
px4-nuttx-c28168e6888089662f84f65e848797a2d3f73eed.zip
Add memccpy{}
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4990 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_adc.c')
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_adc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_adc.c b/nuttx/arch/arm/src/stm32/stm32_adc.c
index 29b4aabdd..777f624aa 100644
--- a/nuttx/arch/arm/src/stm32/stm32_adc.c
+++ b/nuttx/arch/arm/src/stm32/stm32_adc.c
@@ -964,7 +964,9 @@ static void adc_reset(FAR struct adc_dev_s *dev)
uint32_t regval;
int offset;
int i;
+#ifdef ADC_HAVE_TIMER
int ret;
+#endif
avdbg("intf: ADC%d\n", priv->intf);
flags = irqsave();
@@ -987,7 +989,6 @@ static void adc_reset(FAR struct adc_dev_s *dev)
adc_putreg(priv, STM32_ADC_LTR_OFFSET, 0x00000000);
-
/* Initialize the same sample time for each ADC 55.5 cycles
*
* During sample cycles channel selection bits must remain unchanged.