From 68986d51aae16ce2919bf6349ff58428ca82de7a Mon Sep 17 00:00:00 2001
From: Rocco Marco Guglielmi <roccomarco.guglielmi@live.com>
Date: Thu, 2 Jun 2016 15:19:45 +0000
Subject: [PATCH] Fixed Bug #750

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@9556 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/STM32/LLD/ADCv3/adc_lld.c | 12 ++++++------
 os/hal/ports/STM32/LLD/ADCv3/adc_lld.h |  4 ++--
 readme.txt                             |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
index cfdd9c4fe..289b3067d 100644
--- a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
+++ b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
@@ -15,8 +15,8 @@
 */
 
 /**
- * @file    STM32F3xx/adc_lld.c
- * @brief   STM32F3xx ADC subsystem low level driver source.
+ * @file    STM32/LLD/ADCv3/adc_lld.c
+ * @brief   STM32 ADC subsystem low level driver source.
  *
  * @addtogroup ADC
  * @{
@@ -534,6 +534,7 @@ void adc_lld_init(void) {
   ADC1_COMMON->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA;
   rccDisableADC12(FALSE);
 #endif
+#endif
 #if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4
   rccEnableADC34(FALSE);
   rccResetADC34();
@@ -541,7 +542,6 @@ void adc_lld_init(void) {
   rccDisableADC34(FALSE);
 #endif
 #endif
-#endif
 
 #if defined(STM32L4XX)
   rccEnableADC123(FALSE);
@@ -705,7 +705,7 @@ void adc_lld_stop(ADCDriver *adcp) {
 #endif
 
 #if STM32_ADC_USE_ADC2
-    if (&ADCD1 == adcp) {
+    if (&ADCD2 == adcp) {
 #if defined(STM32F3XX)
       /* Resetting CCR options except default ones.*/
       adcp->adcc->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA;
@@ -715,7 +715,7 @@ void adc_lld_stop(ADCDriver *adcp) {
 #endif
 
 #if STM32_ADC_USE_ADC3
-    if (&ADCD1 == adcp) {
+    if (&ADCD3 == adcp) {
 #if defined(STM32F3XX)
       /* Resetting CCR options except default ones.*/
       adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA;
@@ -725,7 +725,7 @@ void adc_lld_stop(ADCDriver *adcp) {
 #endif
 
 #if STM32_ADC_USE_ADC4
-    if (&ADCD1 == adcp) {
+    if (&ADCD4 == adcp) {
 #if defined(STM32F3XX)
       /* Resetting CCR options except default ones.*/
       adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA;
diff --git a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.h b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.h
index 61b62e546..b74cd5d3f 100644
--- a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.h
+++ b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.h
@@ -15,8 +15,8 @@
 */
 
 /**
- * @file    STM32F3xx/adc_lld.h
- * @brief   STM32F3xx ADC subsystem low level driver header.
+ * @file    STM32/LLD/ADCv3/adc_lld.h
+ * @brief   STM32 ADC subsystem low level driver header.
  *
  * @addtogroup ADC
  * @{
diff --git a/readme.txt b/readme.txt
index 0f8820f0b..4a2d120e4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -73,7 +73,8 @@
 *****************************************************************************
 
 *** 16.1.5 ***
-- HAL: Fixed LTO settings and added board folder in STM32F4xx-USB_CDC demo
+- HAL: Fixed bug in STM32/ADCv3 (bug #750).
+- HAL: Fixed OPT settings and added board folder in STM32F4xx-USB_CDC demo
        (bug #749).
 - HAL: Fixed wrong comments in STM32F4xx GPT demo (bug #748).
 - HAL: Fixed wrong comments and indents in STM32F7xx-GPT-ADC and