From 6332cccc4ba5e94fccffd36f8482fcbfa9fce925 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 24 Apr 2021 05:59:38 +0000 Subject: [PATCH] Fixed bug #1155. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14281 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- demos/STM32/RT-STM32G431RB-NUCLEO64/.project | 2 +- os/hal/ports/STM32/STM32G4xx/stm32_isr.h | 8 ++++++++ readme.txt | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/demos/STM32/RT-STM32G431RB-NUCLEO64/.project b/demos/STM32/RT-STM32G431RB-NUCLEO64/.project index 21984fa39..f8bf1cd92 100644 --- a/demos/STM32/RT-STM32G431RB-NUCLEO64/.project +++ b/demos/STM32/RT-STM32G431RB-NUCLEO64/.project @@ -27,7 +27,7 @@ board 2 - CHIBIOS/os/hal/boards/ST_NUCLEO64_G474RE + CHIBIOS/os/hal/boards/ST_NUCLEO64_G431RB os diff --git a/os/hal/ports/STM32/STM32G4xx/stm32_isr.h b/os/hal/ports/STM32/STM32G4xx/stm32_isr.h index a785fe6ea..9445758ea 100644 --- a/os/hal/ports/STM32/STM32G4xx/stm32_isr.h +++ b/os/hal/ports/STM32/STM32G4xx/stm32_isr.h @@ -82,16 +82,20 @@ #define STM32_DMA1_CH4_HANDLER Vector78 #define STM32_DMA1_CH5_HANDLER Vector7C #define STM32_DMA1_CH6_HANDLER Vector80 +#if !defined(STM32G431xx) && !defined(STM32G441xx) #define STM32_DMA1_CH7_HANDLER Vector84 #define STM32_DMA1_CH8_HANDLER Vector1C0 +#endif #define STM32_DMA2_CH1_HANDLER Vector120 #define STM32_DMA2_CH2_HANDLER Vector124 #define STM32_DMA2_CH3_HANDLER Vector128 #define STM32_DMA2_CH4_HANDLER Vector12C #define STM32_DMA2_CH5_HANDLER Vector130 #define STM32_DMA2_CH6_HANDLER Vector1C4 +#if !defined(STM32G431xx) && !defined(STM32G441xx) #define STM32_DMA2_CH7_HANDLER Vector1C8 #define STM32_DMA2_CH8_HANDLER Vector1CC +#endif #define STM32_DMA1_CH1_NUMBER 11 #define STM32_DMA1_CH2_NUMBER 12 @@ -99,16 +103,20 @@ #define STM32_DMA1_CH4_NUMBER 14 #define STM32_DMA1_CH5_NUMBER 15 #define STM32_DMA1_CH6_NUMBER 16 +#if !defined(STM32G431xx) && !defined(STM32G441xx) #define STM32_DMA1_CH7_NUMBER 17 #define STM32_DMA1_CH8_NUMBER 96 +#endif #define STM32_DMA2_CH1_NUMBER 56 #define STM32_DMA2_CH2_NUMBER 57 #define STM32_DMA2_CH3_NUMBER 58 #define STM32_DMA2_CH4_NUMBER 59 #define STM32_DMA2_CH5_NUMBER 60 #define STM32_DMA2_CH6_NUMBER 97 +#if !defined(STM32G431xx) && !defined(STM32G441xx) #define STM32_DMA2_CH7_NUMBER 98 #define STM32_DMA2_CH8_NUMBER 99 +#endif /* * EXTI unit. diff --git a/readme.txt b/readme.txt index f07bebe18..c0bfdd9d4 100644 --- a/readme.txt +++ b/readme.txt @@ -130,6 +130,8 @@ MEMS Accelerometers. - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1). - NEW: Added latency measurement test application. +- FIX: Fixed STM32G431 DMA defines error (bug #1155) + (backported to 20.3.4). - FIX: Fixed errors in STM32L4xx registry (bug #1154) (backported to 20.3.4)(backported to 19.1.5). - FIX: Fixed QUADSPI errata fix applied to all platforms (bug #1153)