aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/ARMCM4-STM32F373-STM32373C_EVAL/mcuconf.h2
-rw-r--r--os/hal/platforms/STM32F37x/adc_lld.c3
-rw-r--r--readme.txt2
-rw-r--r--testhal/STM32F37x/ADC/mcuconf.h2
-rw-r--r--testhal/STM32F37x/CAN/mcuconf.h2
-rw-r--r--testhal/STM32F37x/EXT/mcuconf.h2
-rw-r--r--testhal/STM32F37x/I2C/mcuconf.h2
-rw-r--r--testhal/STM32F37x/IRQ_STORM/mcuconf.h2
-rw-r--r--testhal/STM32F37x/PWM-ICU/mcuconf.h2
-rw-r--r--testhal/STM32F37x/SDADC/mcuconf.h2
-rw-r--r--testhal/STM32F37x/SPI/mcuconf.h2
-rw-r--r--testhal/STM32F37x/UART/mcuconf.h2
-rw-r--r--testhal/STM32F37x/USB_CDC/mcuconf.h2
13 files changed, 15 insertions, 12 deletions
diff --git a/demos/ARMCM4-STM32F373-STM32373C_EVAL/mcuconf.h b/demos/ARMCM4-STM32F373-STM32373C_EVAL/mcuconf.h
index 1434b2fae..5f1ba1599 100644
--- a/demos/ARMCM4-STM32F373-STM32373C_EVAL/mcuconf.h
+++ b/demos/ARMCM4-STM32F373-STM32373C_EVAL/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/os/hal/platforms/STM32F37x/adc_lld.c b/os/hal/platforms/STM32F37x/adc_lld.c
index ff5ef60b3..9e8162933 100644
--- a/os/hal/platforms/STM32F37x/adc_lld.c
+++ b/os/hal/platforms/STM32F37x/adc_lld.c
@@ -322,7 +322,8 @@ void adc_lld_init(void) {
STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_PSIZE_HWORD |
STM32_DMA_CR_MINC | STM32_DMA_CR_TCIE |
STM32_DMA_CR_DMEIE | STM32_DMA_CR_TEIE;
- nvicEnableVector(ADC1_IRQn, CORTEX_PRIORITY_MASK(STM32_ADC_IRQ_PRIORITY));
+ nvicEnableVector(ADC1_IRQn,
+ CORTEX_PRIORITY_MASK(STM32_ADC_ADC1_IRQ_PRIORITY));
#endif
#if STM32_ADC_USE_SDADC1
diff --git a/readme.txt b/readme.txt
index a7045629b..d6ac2df48 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,8 @@
*****************************************************************************
*** 2.7.0 ***
+- FIX: Fixed wrong definition in STM32F37x ADC driver (bug #444)(backported
+ to 2.6.2).
- FIX: Fixed lost incoming characters in STM32 USARTv1 driver (bug #442)
(backported to 2.4.6 and 2.6.2).
- FIX: Fixed UART4/5-related bugs in STM32 USARTv1 UART driver (bug #440)
diff --git a/testhal/STM32F37x/ADC/mcuconf.h b/testhal/STM32F37x/ADC/mcuconf.h
index 7cdc9bf4a..24b77b33d 100644
--- a/testhal/STM32F37x/ADC/mcuconf.h
+++ b/testhal/STM32F37x/ADC/mcuconf.h
@@ -71,7 +71,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/CAN/mcuconf.h b/testhal/STM32F37x/CAN/mcuconf.h
index 1434b2fae..5f1ba1599 100644
--- a/testhal/STM32F37x/CAN/mcuconf.h
+++ b/testhal/STM32F37x/CAN/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/EXT/mcuconf.h b/testhal/STM32F37x/EXT/mcuconf.h
index 1434b2fae..5f1ba1599 100644
--- a/testhal/STM32F37x/EXT/mcuconf.h
+++ b/testhal/STM32F37x/EXT/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/I2C/mcuconf.h b/testhal/STM32F37x/I2C/mcuconf.h
index c18448c10..8bab824f7 100644
--- a/testhal/STM32F37x/I2C/mcuconf.h
+++ b/testhal/STM32F37x/I2C/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/IRQ_STORM/mcuconf.h b/testhal/STM32F37x/IRQ_STORM/mcuconf.h
index 8e8e56597..713d3261b 100644
--- a/testhal/STM32F37x/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F37x/IRQ_STORM/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/PWM-ICU/mcuconf.h b/testhal/STM32F37x/PWM-ICU/mcuconf.h
index 36b5c84a5..1d0623b8c 100644
--- a/testhal/STM32F37x/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F37x/PWM-ICU/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/SDADC/mcuconf.h b/testhal/STM32F37x/SDADC/mcuconf.h
index 8a4e68ba8..c90549c5c 100644
--- a/testhal/STM32F37x/SDADC/mcuconf.h
+++ b/testhal/STM32F37x/SDADC/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/SPI/mcuconf.h b/testhal/STM32F37x/SPI/mcuconf.h
index 5326570a9..cc7cc575a 100644
--- a/testhal/STM32F37x/SPI/mcuconf.h
+++ b/testhal/STM32F37x/SPI/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/UART/mcuconf.h b/testhal/STM32F37x/UART/mcuconf.h
index 1421ff9f3..d7a72a780 100644
--- a/testhal/STM32F37x/UART/mcuconf.h
+++ b/testhal/STM32F37x/UART/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
diff --git a/testhal/STM32F37x/USB_CDC/mcuconf.h b/testhal/STM32F37x/USB_CDC/mcuconf.h
index 4d4320200..5f8e5044b 100644
--- a/testhal/STM32F37x/USB_CDC/mcuconf.h
+++ b/testhal/STM32F37x/USB_CDC/mcuconf.h
@@ -70,7 +70,7 @@
#define STM32_ADC_SDADC1_DMA_PRIORITY 2
#define STM32_ADC_SDADC2_DMA_PRIORITY 2
#define STM32_ADC_SDADC3_DMA_PRIORITY 2
-#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC1_IRQ_PRIORITY 5
#define STM32_ADC_SDADC2_IRQ_PRIORITY 5
#define STM32_ADC_SDADC3_IRQ_PRIORITY 5
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 07:04:49 +0000