aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f4/adc.c
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2013-01-06 17:56:13 -0800
committerPiotr Esden-Tempski2013-01-06 17:56:13 -0800
commit44e350ad20b59448b7b11f0ea7f723fe9255dcf7 (patch)
treeafada8b7edd6f292d530415664af7ab62480bb79 /lib/stm32/f4/adc.c
parentc904c3ae575e1bdb9a6fe69a25f22a254516b201 (diff)
parent08a14a9d9e9f8acb5e38a422ca7d84a3ce0b02ef (diff)
Merging pull request #64 Various changes
Merge remote-tracking branch 'bgamari/master'
Diffstat (limited to 'lib/stm32/f4/adc.c')
-rw-r--r--lib/stm32/f4/adc.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/stm32/f4/adc.c b/lib/stm32/f4/adc.c
index 7475fac..aef49a4 100644
--- a/lib/stm32/f4/adc.c
+++ b/lib/stm32/f4/adc.c
@@ -435,17 +435,12 @@ void adc_set_right_aligned(u32 adc)
/*-----------------------------------------------------------------------------*/
/** @brief ADC Enable DMA Transfers
-Only available for ADC1 through DMA1 channel1, and ADC3 through DMA2 channel5.
-ADC2 will use DMA if it is set as slave in dual mode with ADC1 in DMA transfer
-mode.
-
@param[in] adc Unsigned int32. ADC block register address base @ref adc_reg_base
*/
void adc_enable_dma(u32 adc)
{
- if ((adc == ADC1) | (adc == ADC3))
- ADC_CR2(adc) |= ADC_CR2_DMA;
+ ADC_CR2(adc) |= ADC_CR2_DMA;
}
/*-----------------------------------------------------------------------------*/
@@ -456,8 +451,7 @@ void adc_enable_dma(u32 adc)
void adc_disable_dma(u32 adc)
{
- if ((adc == ADC1) | (adc == ADC3))
- ADC_CR2(adc) &= ~ADC_CR2_DMA;
+ ADC_CR2(adc) &= ~ADC_CR2_DMA;
}
/*-----------------------------------------------------------------------------*/