diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-11-15 10:33:38 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-11-15 10:33:38 +0000 |
| commit | 30b7651875f7eee983f89b153a547ad3c8c4ae0a (patch) | |
| tree | 79746cf3074e1ead4b70f5ff4d68dcc5744ea3e9 | |
| parent | 4501629ac881cb8b6eb3f6154b15cdc4decf3e12 (diff) | |
| download | ChibiOS-30b7651875f7eee983f89b153a547ad3c8c4ae0a.tar.gz ChibiOS-30b7651875f7eee983f89b153a547ad3c8c4ae0a.tar.bz2 ChibiOS-30b7651875f7eee983f89b153a547ad3c8c4ae0a.zip | |
Fixed bug #790.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9910 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/ports/STM32/STM32F3xx/stm32_registry.h | 3 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h index 815a74354..f0c83fe22 100644 --- a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h @@ -593,8 +593,7 @@ #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))
#define STM32_ADC2_DMA_CHN 0x00000000
#define STM32_HAS_ADC3 FALSE
diff --git a/readme.txt b/readme.txt index 7450fcc6e..10ab46a02 100644 --- a/readme.txt +++ b/readme.txt @@ -147,6 +147,8 @@ - RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Fixed wrong DMA definition for STM32F303x8 ADC (bug #790)(backported
+ to 16.1.6).
- VAR: Fixed GCC garbage collector discards code in syscalls.c (bug #789)
(backported to 16.1.6, 3.0.6).
- HAL: Fixed Makefile dependencies not generated for .S files (bug #787)
|