From be1abb574de27de5bd60124ff18cab96ca649413 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 1 Jun 2018 07:45:27 +0000 Subject: [PATCH] Fixed bug #953. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12062 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c | 1 + readme.txt | 2 ++ testhal/STM32/multi/USB_CDC/.cproject | 12 ++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c index 69a094a9d..8885b3a81 100644 --- a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c +++ b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c @@ -553,6 +553,7 @@ void adc_lld_init(void) { #if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4 rccEnableADC34(true); rccResetADC34(); + osalSysPolledDelayX(10); ADC3_4_COMMON->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA; rccDisableADC34(); #endif diff --git a/readme.txt b/readme.txt index b9a2f9d5f..37ad3d65e 100644 --- a/readme.txt +++ b/readme.txt @@ -126,6 +126,8 @@ - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1). - EX: Updated LPS25H to 1.1.0 (backported to 18.2.1). - EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1). +- HAL: Fixed race condition in STM32 ADCv3 driver (bug #953)(backported to + 18.2.2 and 17.6.5). - HAL: Fixed wrong registry entries for STM32F030x4 (bug #952)(backported to 18.2.2). - HAL: Fixed Invalid divider settings in Serial and UART STM32 drivers diff --git a/testhal/STM32/multi/USB_CDC/.cproject b/testhal/STM32/multi/USB_CDC/.cproject index a4b2c720b..f8f0913a6 100644 --- a/testhal/STM32/multi/USB_CDC/.cproject +++ b/testhal/STM32/multi/USB_CDC/.cproject @@ -227,22 +227,22 @@ - + - + - + - + - + - +