From 5c2d8efab35edb7051d63a05fb473a3d28ead047 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 13 Dec 2015 19:55:23 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8596
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/ports/STM32/LLD/ADCv3/adc_lld.c                      | 6 +++---
 testhal/STM32/STM32L4xx/GPT-ADC/chconf.h                    | 2 --
 .../debug/STM32L4xx-GPT-ADC (OpenOCD, Just Run).launch      | 2 +-
 testhal/STM32/STM32L4xx/GPT-ADC/main.c                      | 6 ------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
index 36d3a320e..a4a690300 100644
--- a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
+++ b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
@@ -468,13 +468,13 @@ void adc_lld_init(void) {
 #if defined(STM32F3XX)
 #if STM32_ADC_USE_ADC1 || STM32_ADC_USE_ADC2
   rccEnableADC12(FALSE);
-  osalSysPolledDelayX(12);
+//  osalSysPolledDelayX(12);
   ADC1_2_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA;
   rccDisableADC12(FALSE);
 #endif
 #if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4
   rccEnableADC34(FALSE);
-  osalSysPolledDelayX(12);
+//  osalSysPolledDelayX(12);
   ADC3_4_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA;
   rccDisableADC34(FALSE);
 #endif
@@ -482,7 +482,7 @@ void adc_lld_init(void) {
 
 #if defined(STM32L4XX)
   rccEnableADC123(FALSE);
-  osalSysPolledDelayX(12);
+//  osalSysPolledDelayX(12);
   ADC123_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA;
   rccDisableADC123(FALSE);
 #endif
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/chconf.h b/testhal/STM32/STM32L4xx/GPT-ADC/chconf.h
index 1646c0e44..405149b3b 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/chconf.h
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/chconf.h
@@ -494,8 +494,6 @@
 /* Port-specific settings (override port settings defaulted in chcore.h).    */
 /*===========================================================================*/
 
-#define CORTEX_VTOR_INIT                    0x00200000U
-
 #endif  /* _CHCONF_H_ */
 
 /** @} */
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/debug/STM32L4xx-GPT-ADC (OpenOCD, Just Run).launch b/testhal/STM32/STM32L4xx/GPT-ADC/debug/STM32L4xx-GPT-ADC (OpenOCD, Just Run).launch
index e55f19e79..a218dadf8 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/debug/STM32L4xx-GPT-ADC (OpenOCD, Just Run).launch	
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/debug/STM32L4xx-GPT-ADC (OpenOCD, Just Run).launch	
@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="0"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;r3-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;vt_delta-null-chVTDoSetI-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;r0-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r11-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r3-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r2-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;vt_delta-null-chVTDoSetI-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList&gt;&#13;&#10;&lt;memoryBlockExpressionItem&gt;&#13;&#10;&lt;expression text=&quot;0x20010744&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionItem&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/main.c b/testhal/STM32/STM32L4xx/GPT-ADC/main.c
index 45a369663..ca691c205 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/main.c
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/main.c
@@ -159,12 +159,6 @@ int main(void) {
    */
   gptStart(&GPTD4, &gpt4cfg1);
 
-  /*
-   * Fixed an errata on the STM32F7xx, the DAC clock is required for ADC
-   * triggering.
-   */
-  rccEnableDAC1(false);
-
   /*
    * Activates the ADC1 driver and the temperature sensor.
    */