aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-01-22 13:29:48 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-01-22 13:29:48 +0000
commit0837d7958c768872d80b6fa45e8a178cecf307b0 (patch)
tree5dc972b69d6258e8c298562849ec4b2303286c46
parent027e1f38459888c6641a66063bfd203493c35dd4 (diff)
downloadChibiOS-0837d7958c768872d80b6fa45e8a178cecf307b0.tar.gz
ChibiOS-0837d7958c768872d80b6fa45e8a178cecf307b0.tar.bz2
ChibiOS-0837d7958c768872d80b6fa45e8a178cecf307b0.zip
Fixed bug #460.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6637 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32F0xx/adc_lld.c3
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/os/hal/platforms/STM32F0xx/adc_lld.c b/os/hal/platforms/STM32F0xx/adc_lld.c
index 7d148aaaa..ba4834b40 100644
--- a/os/hal/platforms/STM32F0xx/adc_lld.c
+++ b/os/hal/platforms/STM32F0xx/adc_lld.c
@@ -156,8 +156,7 @@ void adc_lld_init(void) {
/* The shared vector is initialized on driver initialization and never
disabled.*/
- nvicEnableVector(ADC1_COMP_IRQn,
- CORTEX_PRIORITY_MASK(STM32_ADC_IRQ_PRIORITY));
+ nvicEnableVector(12, CORTEX_PRIORITY_MASK(STM32_ADC_IRQ_PRIORITY));
/* Calibration procedure.*/
rccEnableADC1(FALSE);
diff --git a/readme.txt b/readme.txt
index da17204b0..f2e2b9d19 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,8 @@
*****************************************************************************
*** 2.7.0 ***
+- FIX: Fixed compile error in STM32F0xx ADC driver when STM32F0XX_LD devices
+ are selected (bug #460)(backported to 2.6.3).
- FIX: Fixed race condition in STM32 SDC driver (bug #458)(backported
to 2.6.3).
- FIX: Fixed race condition in STM32 OTG driver (bug #457)(backported