From c807840cdcec4e09b3fd0d2268370d9a317f0b90 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 27 Jul 2013 07:57:43 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@6030 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/adc.h | 8 ++++---- os/hal/platforms/STM32/adc_lld.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/os/hal/include/adc.h b/os/hal/include/adc.h index 39dd333f4..3e88f13cf 100644 --- a/os/hal/include/adc.h +++ b/os/hal/include/adc.h @@ -187,8 +187,8 @@ typedef enum { if ((adcp)->ad_depth > 1) { \ /* Invokes the callback passing the 2nd half of the buffer.*/ \ size_t half = (adcp)->ad_depth / 2; \ - size_t half_index = half * (adcp)->grpp->acg_num_channels; \ - (adcp)->grpp->acg_endcb(adcp, \ + size_t half_index = half * (adcp)->ad_grpp->acg_num_channels; \ + (adcp)->ad_grpp->acg_endcb(adcp, \ (adcp)->ad_samples + half_index, half); \ } \ else { \ @@ -206,8 +206,8 @@ typedef enum { if ((adcp)->ad_depth > 1) { \ /* Invokes the callback passing the 2nd half of the buffer.*/ \ size_t half = (adcp)->ad_depth / 2; \ - size_t half_index = half * (adcp)->grpp->acg_num_channels; \ - (adcp)->grpp->acg_endcb(adcp, \ + size_t half_index = half * (adcp)->ad_grpp->acg_num_channels; \ + (adcp)->ad_grpp->acg_endcb(adcp, \ (adcp)->ad_samples + half_index, half); \ } \ else { \ diff --git a/os/hal/platforms/STM32/adc_lld.c b/os/hal/platforms/STM32/adc_lld.c index cf544489d..7a3c582d8 100644 --- a/os/hal/platforms/STM32/adc_lld.c +++ b/os/hal/platforms/STM32/adc_lld.c @@ -210,7 +210,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) { else n = (uint32_t)grpp->acg_num_channels; dmaChannelSetup(adcp->ad_dmachp, n, adcp->ad_samples, ccr); - dmaChannelEnable(adcp->dmastp); + dmaChannelEnable(adcp->ad_dmachp); /* ADC setup.*/ adcp->ad_adc->CR1 = grpp->acg_cr1 | ADC_CR1_SCAN;