From 409d6dccb91545ef128ad7334e0959abbacbe62f Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 1 Oct 2017 14:04:01 +0000 Subject: [PATCH] Fixed #889. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10732 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32F0xx/stm32_registry.h | 6 +++--- os/hal/ports/STM32/STM32F4xx/stm32_registry.h | 3 ++- readme.txt | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h index 016d3a651..adba521a0 100644 --- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h @@ -1780,7 +1780,7 @@ #define STM32_ADC1_NUMBER 12 #define STM32_ADC1_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 1) |\ STM32_DMA_STREAM_ID_MSK(1, 2) |\ - STM32_DMA_STREAM_ID_MSK(3, 5)) + STM32_DMA_STREAM_ID_MSK(2, 5)) #define STM32_ADC1_DMA_CHN 0x00100011 #define STM32_HAS_ADC2 FALSE @@ -1877,7 +1877,7 @@ #define STM32_I2C1_RX_DMA_CHN 0x02000200 #define STM32_I2C1_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 2) |\ STM32_DMA_STREAM_ID_MSK(1, 6)) -#define STM32_I2C1_TX_DMA_CHN 0x00200002 +#define STM32_I2C1_TX_DMA_CHN 0x00200020 #define STM32_HAS_I2C2 TRUE #define STM32_I2C2_RX_DMA_MSK STM32_DMA_STREAM_ID_MSK(1, 5) @@ -1919,7 +1919,7 @@ STM32_DMA_STREAM_ID_MSK(1, 6)) #define STM32_SPI2_RX_DMA_CHN 0x00303000 #define STM32_SPI2_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 5) |\ - STM32_DMA_STREAM_ID_MSK(1, 5)) + STM32_DMA_STREAM_ID_MSK(1, 7)) #define STM32_SPI2_TX_DMA_CHN 0x03030000 #define STM32_HAS_SPI3 FALSE diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h index 1ce4a428d..8d663aef7 100644 --- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h @@ -1594,7 +1594,8 @@ STM32_DMA_STREAM_ID_MSK(1, 5)) #define STM32_I2C1_RX_DMA_CHN 0x00100001 #define STM32_I2C1_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 7) |\ - STM32_DMA_STREAM_ID_MSK(1, 6)) + STM32_DMA_STREAM_ID_MSK(1, 6) |\ + STM32_DMA_STREAM_ID_MSK(1, 1)) #define STM32_I2C1_TX_DMA_CHN 0x11000000 #define STM32_HAS_I2C2 TRUE diff --git a/readme.txt b/readme.txt index 5e6576240..dad395474 100644 --- a/readme.txt +++ b/readme.txt @@ -124,6 +124,8 @@ dependencies and configuration directories. This makes possible to have multiple non-conflicting makefiles in the same project. Updated the various platform.mk implementing "smart build" mode. +- HAL: Fixed various STM32 registry problems (bug #889)(backported to 17.6.2 + and 16.1.10). - LIB: Fixed heap allocator returning unaligned blocks (bug #888)(backported to 17.6.2). - NIL: Fixed duplicated entries in NIL documentation (bug #887)(backported