From f528f0945a36d8237a7c3e0917ed7aa670a999ea Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 24 Jul 2020 08:45:16 +0000 Subject: [PATCH] #1117 #1. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13778 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c | 14 +++++++------- os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c index 9078ba95d..f8be8d3f6 100644 --- a/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c +++ b/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c @@ -32,24 +32,24 @@ #if STM32_ADC_DUAL_MODE == TRUE #if STM32_ADC_COMPACT_SAMPLES == TRUE -/* Compact type dual mode.*/ -#define ADC_DMA_SIZE (STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_PSIZE_HWORD) -#define ADC_DMA_DAMDF ADC_CCR_DAMDF_HWORD +/* Compact type dual mode, 2x8-bit.*/ +#define ADC12_DMA_SIZE (STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_PSIZE_HWORD) +#define ADC_DMA_DAMDF ADC_CCR_DAMDF_BYTE #else /* STM32_ADC_COMPACT_SAMPLES == FALSE */ -/* Large type dual mode.*/ +/* Large type dual mode, 2x16bit.*/ #define ADC_DMA_SIZE (STM32_DMA_CR_MSIZE_WORD | STM32_DMA_CR_PSIZE_WORD) -#define ADC_DMA_DAMDF ADC_CCR_DAMDF_WORD +#define ADC_DMA_DAMDF ADC_CCR_DAMDF_HWORD #endif /* !STM32_ADC_COMPACT_SAMPLES */ #else /* STM32_ADC_DUAL_MODE == FALSE */ #if STM32_ADC_COMPACT_SAMPLES -/* Compact type single mode.*/ +/* Compact type single mode, 8-bit.*/ #define ADC_DMA_SIZE (STM32_DMA_CR_MSIZE_BYTE | STM32_DMA_CR_PSIZE_BYTE) #define ADC_DMA_DAMDF ADC_CCR_DAMDF_DISABLED #else /* STM32_ADC_COMPACT_SAMPLES == FALSE */ -/* Large type single mode.*/ +/* Large type single mode, 16-bit.*/ #define ADC_DMA_SIZE (STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_PSIZE_HWORD) #define ADC_DMA_DAMDF ADC_CCR_DAMDF_DISABLED #endif /* STM32_ADC_COMPACT_SAMPLES == FALSE */ diff --git a/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.h b/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.h index 0e22517ba..7e0e8293a 100644 --- a/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.h +++ b/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.h @@ -142,7 +142,7 @@ #define ADC_CCR_DAMDF_MASK (3U << 14U) #define ADC_CCR_DAMDF_DISABLED (0U << 14U) #define ADC_CCR_DAMDF_HWORD (2U << 14U) -#define ADC_CCR_DAMDF_WORD (3U << 14U) +#define ADC_CCR_DAMDF_BYTE (3U << 14U) #define ADC_CCR_CKMODE_MASK (3U << 16U) #define ADC_CCR_CKMODE_ADCCK (0U << 16U) #define ADC_CCR_CKMODE_AHB_DIV1 (1U << 16U)