From f78801ac5cb4f5796ada434eacc907261601c9b8 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 28 May 2017 15:11:23 +0000 Subject: Fixed bug #840. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10215 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F334-DISCOVERY/mcuconf.h | 2 +- demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h | 2 +- os/hal/ports/STM32/STM32F3xx/stm32_registry.h | 4 ++-- readme.txt | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F334-DISCOVERY/mcuconf.h index cc5ce8913..7433e7a4e 100644 --- a/demos/STM32/RT-STM32F334-DISCOVERY/mcuconf.h +++ b/demos/STM32/RT-STM32F334-DISCOVERY/mcuconf.h @@ -67,7 +67,7 @@ #define STM32_ADC_USE_ADC1 FALSE #define STM32_ADC_USE_ADC2 FALSE #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1) -#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(2, 1) +#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) #define STM32_ADC_ADC1_DMA_PRIORITY 2 #define STM32_ADC_ADC2_DMA_PRIORITY 2 #define STM32_ADC_ADC12_IRQ_PRIORITY 5 diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h index cc5ce8913..7433e7a4e 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h +++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h @@ -67,7 +67,7 @@ #define STM32_ADC_USE_ADC1 FALSE #define STM32_ADC_USE_ADC2 FALSE #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1) -#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(2, 1) +#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) #define STM32_ADC_ADC1_DMA_PRIORITY 2 #define STM32_ADC_ADC2_DMA_PRIORITY 2 #define STM32_ADC_ADC12_IRQ_PRIORITY 5 diff --git a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h index a15d95908..f24859464 100644 --- a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h @@ -2423,8 +2423,8 @@ #define STM32_HAS_ADC2 TRUE #define STM32_ADC2_HANDLER Vector88 #define STM32_ADC2_NUMBER 18 -#define STM32_ADC2_DMA_MSK (STM32_DMA_STREAM_ID_MSK(2, 1) |\ - STM32_DMA_STREAM_ID_MSK(2, 3)) +#define STM32_ADC2_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 2) |\ + STM32_DMA_STREAM_ID_MSK(1, 4)) #define STM32_ADC2_DMA_CHN 0x00000000 #define STM32_HAS_ADC3 FALSE diff --git a/readme.txt b/readme.txt index bf77f32f0..7b8e93825 100644 --- a/readme.txt +++ b/readme.txt @@ -161,6 +161,8 @@ - RT: Merged RT4. - NIL: Merged NIL2. - NIL: Added STM32F7 demo. +- HAL: Fixed invalid DMA channels for STM32F334 ADC2 (bug #840)(backported + to 16.1.9). - HAL: Fixed invalid number of elements in STM32F3xx EXT demo (bug #839) (backported to 16.1.9). - HAL: Fixed dependency to kernel in uart lld (v1) (bug #838)(backported -- cgit v1.2.3