From 5e84acec84ad4a804440c0ab1dfc7020ee07649f Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 3 Dec 2013 08:34:59 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6522 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h | 2 +- demos/rt/RT-STM32F373-STM32373C_EVAL/mcuconf.h | 2 +- os/hal/ports/STM32F37x/adc_lld.c | 2 +- testhal/STM32F37x/ADC/mcuconf.h | 2 +- testhal/STM32F37x/CAN/mcuconf.h | 2 +- testhal/STM32F37x/EXT/mcuconf.h | 2 +- testhal/STM32F37x/I2C/mcuconf.h | 2 +- testhal/STM32F37x/IRQ_STORM/mcuconf.h | 2 +- testhal/STM32F37x/PWM-ICU/mcuconf.h | 2 +- testhal/STM32F37x/SDADC/mcuconf.h | 2 +- testhal/STM32F37x/SPI/mcuconf.h | 2 +- testhal/STM32F37x/UART/mcuconf.h | 2 +- testhal/STM32F37x/USB_CDC/mcuconf.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h b/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h index 272ee34b7..afbcb154a 100644 --- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h +++ b/demos/nil/NIL-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/demos/rt/RT-STM32F373-STM32373C_EVAL/mcuconf.h b/demos/rt/RT-STM32F373-STM32373C_EVAL/mcuconf.h index 272ee34b7..afbcb154a 100644 --- a/demos/rt/RT-STM32F373-STM32373C_EVAL/mcuconf.h +++ b/demos/rt/RT-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/ports/STM32F37x/adc_lld.c b/os/hal/ports/STM32F37x/adc_lld.c index 72514ded6..2317aef25 100644 --- a/os/hal/ports/STM32F37x/adc_lld.c +++ b/os/hal/ports/STM32F37x/adc_lld.c @@ -321,7 +321,7 @@ 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, STM32_ADC_IRQ_PRIORITY); + nvicEnableVector(ADC1_IRQn, STM32_ADC_ADC1_IRQ_PRIORITY); #endif #if STM32_ADC_USE_SDADC1 diff --git a/testhal/STM32F37x/ADC/mcuconf.h b/testhal/STM32F37x/ADC/mcuconf.h index f2e3e3def..d4e69dafe 100644 --- a/testhal/STM32F37x/ADC/mcuconf.h +++ b/testhal/STM32F37x/ADC/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/CAN/mcuconf.h b/testhal/STM32F37x/CAN/mcuconf.h index bd19e13be..169b64c76 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 bd19e13be..169b64c76 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 1aa67cfaf..ae51be7b1 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 0a6f6e675..a913da351 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 0e5bc5c39..d779ed3f8 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 9f383d592..9768c0deb 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 3747b2b78..2269c0a54 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 1ce2fb303..869b709e6 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 6ae1d389a..4ebd6c8a9 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