From 60f5b5821210140672789687df884308aee80a8d Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 23 Nov 2021 18:55:25 +0100 Subject: [PATCH] Move external module serial to HAL LL --- .../common/arm/stm32/extmodule_driver.cpp | 22 +--- .../arm/stm32/extmodule_serial_driver.cpp | 121 +++++++++--------- .../common/arm/stm32/f4/CMakeLists.txt | 1 + .../targets/common/arm/stm32/stm32_hal_ll.h | 45 +++++++ radio/src/targets/horus/hal.h | 5 + radio/src/targets/nv14/hal.h | 6 +- radio/src/targets/taranis/hal.h | 3 + 7 files changed, 124 insertions(+), 79 deletions(-) create mode 100644 radio/src/targets/common/arm/stm32/stm32_hal_ll.h diff --git a/radio/src/targets/common/arm/stm32/extmodule_driver.cpp b/radio/src/targets/common/arm/stm32/extmodule_driver.cpp index eb32cdc19..42324e091 100644 --- a/radio/src/targets/common/arm/stm32/extmodule_driver.cpp +++ b/radio/src/targets/common/arm/stm32/extmodule_driver.cpp @@ -19,27 +19,7 @@ * GNU General Public License for more details. */ -extern "C" { - #define USE_FULL_LL_DRIVER - #if defined(STM32F4) - #include "CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h" - #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h" - #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h" - #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h" - #elif defined(STM32F2) - - // Workaround to prevent the other CMSIS header to be included - // and fix some missing items in the old one - #include "thirdparty/CMSIS/Include/cmsis_compiler.h" - #define __CORE_CM3_H_GENERIC - - #include "CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h" - #include "STM32F2xx_HAL_Driver/Inc/stm32f2xx_ll_gpio.h" - #include "STM32F2xx_HAL_Driver/Inc/stm32f2xx_ll_tim.h" - #include "STM32F2xx_HAL_Driver/Inc/stm32f2xx_ll_dma.h" - #endif -} - +#include "stm32_hal_ll.h" #include "hal.h" #include "extmodule_driver.h" #include "timers_driver.h" diff --git a/radio/src/targets/common/arm/stm32/extmodule_serial_driver.cpp b/radio/src/targets/common/arm/stm32/extmodule_serial_driver.cpp index 9479bcff9..30a83e712 100644 --- a/radio/src/targets/common/arm/stm32/extmodule_serial_driver.cpp +++ b/radio/src/targets/common/arm/stm32/extmodule_serial_driver.cpp @@ -19,6 +19,7 @@ * GNU General Public License for more details. */ +#include "stm32_hal_ll.h" #include "extmodule_serial_driver.h" #include "board.h" @@ -63,24 +64,24 @@ static void extmoduleSerialStart(const etx_serial_init* params) extmodule_driver.on_error = params->on_error; // TX + RX Pins - GPIO_PinAFConfig(EXTMODULE_USART_GPIO, EXTMODULE_TX_GPIO_PinSource, - EXTMODULE_USART_GPIO_AF); - GPIO_PinAFConfig(EXTMODULE_USART_GPIO, EXTMODULE_RX_GPIO_PinSource, - EXTMODULE_USART_GPIO_AF); - - GPIO_InitTypeDef GPIO_InitStructure; - GPIO_InitStructure.GPIO_Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; - GPIO_Init(EXTMODULE_USART_GPIO, &GPIO_InitStructure); + LL_GPIO_InitTypeDef pinInit; + LL_GPIO_StructInit(&pinInit); + pinInit.Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN; + pinInit.Mode = LL_GPIO_MODE_ALTERNATE; + pinInit.Pull = LL_GPIO_PULL_UP; + pinInit.Alternate = EXTMODULE_USART_GPIO_AF_LL; + LL_GPIO_Init(EXTMODULE_USART_GPIO, &pinInit); // UART config stm32_usart_init(EXTMODULE_USART, params); extmoduleFifo.clear(); - USART_ITConfig(EXTMODULE_USART, USART_IT_RXNE, ENABLE); + // Enable TX DMA request + LL_USART_EnableDMAReq_TX(EXTMODULE_USART); + + // Enable RX IRQ + LL_USART_EnableIT_RXNE(EXTMODULE_USART); + NVIC_SetPriority(EXTMODULE_USART_IRQn, 6); NVIC_EnableIRQ(EXTMODULE_USART_IRQn); } @@ -107,17 +108,18 @@ void extmoduleSerialStop() { DMA_DeInit(EXTMODULE_USART_TX_DMA_STREAM); - GPIO_InitTypeDef GPIO_InitStructure; - GPIO_InitStructure.GPIO_Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_DOWN; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; - GPIO_Init(EXTMODULE_USART_GPIO, &GPIO_InitStructure); + // Reconfigure pin as output + LL_GPIO_InitTypeDef pinInit; + LL_GPIO_StructInit(&pinInit); - USART_DeInit(EXTMODULE_USART); + pinInit.Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN; + pinInit.Mode = LL_GPIO_MODE_OUTPUT; + pinInit.Pull = LL_GPIO_PULL_DOWN; + LL_GPIO_Init(EXTMODULE_TX_GPIO, &pinInit); - GPIO_ResetBits(EXTMODULE_USART_GPIO, EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN); + LL_USART_DeInit(EXTMODULE_USART); + LL_GPIO_ResetOutputPin(EXTMODULE_USART_GPIO, + EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN); // reset callbacks extmodule_driver.on_receive = nullptr; @@ -126,35 +128,27 @@ void extmoduleSerialStop() static void extmoduleSendByte(uint8_t byte) { - while (!(EXTMODULE_USART->SR & USART_SR_TXE)); - USART_SendData(EXTMODULE_USART, byte); + while (!LL_USART_IsActiveFlag_TXE(EXTMODULE_USART)); + LL_USART_TransmitData8(EXTMODULE_USART, byte); } static void extmoduleSendBuffer(const uint8_t * data, uint8_t size) { - if (size == 0) - return; + if (size == 0) return; + LL_DMA_DeInit(EXTMODULE_USART_TX_DMA, EXTMODULE_USART_TX_DMA_STREAM_LL); - DMA_InitTypeDef DMA_InitStructure; - DMA_DeInit(EXTMODULE_USART_TX_DMA_STREAM); - DMA_InitStructure.DMA_Channel = EXTMODULE_USART_TX_DMA_CHANNEL; - DMA_InitStructure.DMA_PeripheralBaseAddr = CONVERT_PTR_UINT(&EXTMODULE_USART->DR); - DMA_InitStructure.DMA_DIR = DMA_DIR_MemoryToPeripheral; - DMA_InitStructure.DMA_Memory0BaseAddr = CONVERT_PTR_UINT(data); - DMA_InitStructure.DMA_BufferSize = size; - DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; - DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; - DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; - DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte; - DMA_InitStructure.DMA_Mode = DMA_Mode_Normal; - DMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh; - DMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Disable; - DMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full; - DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single; - DMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_Single; - DMA_Init(EXTMODULE_USART_TX_DMA_STREAM, &DMA_InitStructure); - DMA_Cmd(EXTMODULE_USART_TX_DMA_STREAM, ENABLE); - USART_DMACmd(EXTMODULE_USART, USART_DMAReq_Tx, ENABLE); + LL_DMA_InitTypeDef dmaInit; + LL_DMA_StructInit(&dmaInit); + dmaInit.Channel = EXTMODULE_USART_TX_DMA_CHANNEL; + dmaInit.PeriphOrM2MSrcAddress = CONVERT_PTR_UINT(&EXTMODULE_USART->DR); + dmaInit.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH; + dmaInit.MemoryOrM2MDstAddress = CONVERT_PTR_UINT(data); + dmaInit.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT; + dmaInit.NbData = size; + dmaInit.Priority = LL_DMA_PRIORITY_VERYHIGH; + + LL_DMA_Init(EXTMODULE_USART_TX_DMA, EXTMODULE_USART_TX_DMA_STREAM_LL, &dmaInit); + LL_DMA_EnableStream(EXTMODULE_USART_TX_DMA, EXTMODULE_USART_TX_DMA_STREAM_LL); } #define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE) @@ -163,9 +157,9 @@ extern "C" void EXTMODULE_USART_IRQHandler(void) // No ISR based send loop: DMA only // Receive - uint32_t status = EXTMODULE_USART->SR; + uint32_t status = LL_USART_ReadReg(EXTMODULE_USART, SR); while (status & (USART_FLAG_RXNE | USART_FLAG_ERRORS)) { - uint8_t data = EXTMODULE_USART->DR; + uint8_t data = LL_USART_ReceiveData8(EXTMODULE_USART); if (status & USART_FLAG_ERRORS) { if (extmodule_driver.on_error) extmodule_driver.on_error(); @@ -174,23 +168,36 @@ extern "C" void EXTMODULE_USART_IRQHandler(void) if (extmodule_driver.on_receive) extmodule_driver.on_receive(data); } - status = EXTMODULE_USART->SR; + status = LL_USART_ReadReg(EXTMODULE_USART, SR); } } static void extmoduleWaitForTxCompleted() { -#if !defined(SIMU) // TODO: check if everything is properly initialised, this seems to block when // the port has been initialised with a zero baudrate - if (DMA_GetCmdStatus(EXTMODULE_USART_TX_DMA_STREAM) == ENABLE) { - while (DMA_GetFlagStatus(EXTMODULE_USART_TX_DMA_STREAM, - EXTMODULE_USART_TX_DMA_FLAG_TC) == RESET) - ; - DMA_ClearFlag(EXTMODULE_USART_TX_DMA_STREAM, - EXTMODULE_USART_TX_DMA_FLAG_TC); + if (LL_DMA_IsEnabledStream(EXTMODULE_USART_TX_DMA, + EXTMODULE_USART_TX_DMA_STREAM_LL)) { + + static_assert(EXTMODULE_USART_TX_DMA_STREAM_LL == LL_DMA_STREAM_3 || + EXTMODULE_USART_TX_DMA_STREAM_LL == LL_DMA_STREAM_6 || + EXTMODULE_USART_TX_DMA_STREAM_LL == LL_DMA_STREAM_7, ""); + + switch(EXTMODULE_USART_TX_DMA_STREAM_LL) { + case LL_DMA_STREAM_3: + while (LL_DMA_IsActiveFlag_TC3(EXTMODULE_USART_TX_DMA)); + LL_DMA_ClearFlag_TC3(EXTMODULE_USART_TX_DMA); + break; + case LL_DMA_STREAM_6: + while (LL_DMA_IsActiveFlag_TC6(EXTMODULE_USART_TX_DMA)); + LL_DMA_ClearFlag_TC6(EXTMODULE_USART_TX_DMA); + break; + case LL_DMA_STREAM_7: + while (LL_DMA_IsActiveFlag_TC7(EXTMODULE_USART_TX_DMA)); + LL_DMA_ClearFlag_TC7(EXTMODULE_USART_TX_DMA); + break; + } } -#endif } const etx_serial_driver_t ExtmoduleSerialDriver = { diff --git a/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt index 18546b8aa..4324ed96a 100644 --- a/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt @@ -9,6 +9,7 @@ add_library(stm32cube_ll OBJECT ${STM32CUBE_DIR}/Src/stm32f4xx_ll_gpio.c ${STM32CUBE_DIR}/Src/stm32f4xx_ll_tim.c ${STM32CUBE_DIR}/Src/stm32f4xx_ll_dma.c + ${STM32CUBE_DIR}/Src/stm32f4xx_ll_usart.c ) target_compile_options(stm32cube_ll PRIVATE -DUSE_FULL_LL_DRIVER) diff --git a/radio/src/targets/common/arm/stm32/stm32_hal_ll.h b/radio/src/targets/common/arm/stm32/stm32_hal_ll.h new file mode 100644 index 000000000..e4923c9b5 --- /dev/null +++ b/radio/src/targets/common/arm/stm32/stm32_hal_ll.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#pragma once + +extern "C" { + #define USE_FULL_LL_DRIVER + #if defined(STM32F4) + #include "CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h" + #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h" + #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h" + #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h" + #include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h" + #elif defined(STM32F2) + + // Workaround to prevent the other CMSIS header to be included + // and fix some missing items in the old one + #include "thirdparty/CMSIS/Include/cmsis_compiler.h" + #define __CORE_CM3_H_GENERIC + + #include "CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h" + #include "STM32F2xx_HAL_Driver/Inc/stm32f2xx_ll_gpio.h" + #include "STM32F2xx_HAL_Driver/Inc/stm32f2xx_ll_tim.h" + #include "STM32F2xx_HAL_Driver/Inc/stm32f2xx_ll_dma.h" + #include "STM32F4xx_HAL_Driver/Inc/stm32f2xx_ll_usart.h" + #endif +} diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index 629ae92c3..6c86f2153 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -841,8 +841,10 @@ #define EXTMODULE_TX_GPIO GPIOB #define EXTMODULE_USART_GPIO EXTMODULE_TX_GPIO #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PB.10 (TIM2_CH3) + #define EXTMODULE_TX_GPIO_PIN_LL LL_GPIO_PIN_10 // PB.10 (TIM2_CH3) #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource10 #define EXTMODULE_RX_GPIO_PIN GPIO_Pin_11 // PB.11 + #define EXTMODULE_RX_GPIO_PIN_LL LL_GPIO_PIN_11 // PB.11 #define EXTMODULE_RX_GPIO_PinSource GPIO_PinSource11 #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM2 #define EXTMODULE_TIMER TIM2 @@ -860,11 +862,14 @@ #define EXTMODULE_TIMER_DMA_STREAM_IRQn DMA1_Stream1_IRQn #define EXTMODULE_TIMER_DMA_IRQHandler DMA1_Stream1_IRQHandler #define EXTMODULE_USART_GPIO_AF GPIO_AF_USART3 + #define EXTMODULE_USART_GPIO_AF_LL LL_GPIO_AF_7 #define EXTMODULE_USART USART3 #define EXTMODULE_USART_IRQn USART3_IRQn #define EXTMODULE_USART_IRQHandler USART3_IRQHandler + #define EXTMODULE_USART_TX_DMA DMA1 #define EXTMODULE_USART_TX_DMA_CHANNEL DMA_Channel_4 #define EXTMODULE_USART_TX_DMA_STREAM DMA1_Stream3 + #define EXTMODULE_USART_TX_DMA_STREAM_LL LL_DMA_STREAM_3 #define EXTMODULE_USART_TX_DMA_FLAG_TC DMA_FLAG_TCIF3 #define EXTMODULE_USART_RX_DMA_CHANNEL DMA_Channel_4 #define EXTMODULE_USART_RX_DMA_STREAM DMA1_Stream1 diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h index 2345dc442..e7c540082 100644 --- a/radio/src/targets/nv14/hal.h +++ b/radio/src/targets/nv14/hal.h @@ -425,11 +425,13 @@ #define EXTMODULE_RCC_APB2Periph (RCC_APB2Periph_TIM8 | RCC_APB2Periph_USART6) #define EXTMODULE_TX_GPIO GPIOC #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_6 // PC.06 +#define EXTMODULE_TX_GPIO_PIN_LL LL_GPIO_PIN_6 #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource6 #define EXTMODULE_TX_GPIO_AF GPIO_AF_TIM8 // TIM8_CH1 #define EXTMODULE_TX_GPIO_AF_USART GPIO_AF_USART6 #define EXTMODULE_RX_GPIO GPIOC #define EXTMODULE_RX_GPIO_PIN GPIO_Pin_7 // PC.07 +#define EXTMODULE_RX_GPIO_PIN_LL LL_GPIO_PIN_7 #define EXTMODULE_RX_GPIO_PinSource GPIO_PinSource7 #define EXTMODULE_RX_GPIO_AF_USART GPIO_AF_USART6 #define EXTMODULE_TIMER TIM8 @@ -443,9 +445,11 @@ #define EXTMODULE_USART USART6 #define EXTMODULE_USART_GPIO GPIOC #define EXTMODULE_USART_GPIO_AF GPIO_AF_USART6 - +#define EXTMODULE_USART_GPIO_AF_LL LL_GPIO_AF_8 +#define EXTMODULE_USART_TX_DMA DMA2 #define EXTMODULE_USART_TX_DMA_CHANNEL DMA_Channel_5 #define EXTMODULE_USART_TX_DMA_STREAM DMA2_Stream7 +#define EXTMODULE_USART_TX_DMA_STREAM_LL LL_DMA_STREAM_7 #define EXTMODULE_USART_TX_DMA_IRQn DMA2_Stream7_IRQn #define EXTMODULE_USART_TX_DMA_IRQHandler DMA2_Stream7_IRQHandler #define EXTMODULE_USART_TX_DMA_FLAG_TC DMA_IT_TCIF7 diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index c11127cd3..e92f82da3 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1542,11 +1542,14 @@ #define EXTMODULE_TIMER_OUTPUT_ENABLE TIM_CCER_CC1E #define EXTMODULE_TIMER_OUTPUT_POLARITY TIM_CCER_CC1P #define EXTMODULE_USART_GPIO_AF GPIO_AF_USART6 + #define EXTMODULE_USART_GPIO_AF_LL LL_GPIO_AF_8 #define EXTMODULE_USART USART6 #define EXTMODULE_USART_IRQn USART6_IRQn #define EXTMODULE_USART_IRQHandler USART6_IRQHandler + #define EXTMODULE_USART_TX_DMA DMA2 #define EXTMODULE_USART_TX_DMA_CHANNEL DMA_Channel_5 #define EXTMODULE_USART_TX_DMA_STREAM DMA2_Stream6 + #define EXTMODULE_USART_TX_DMA_STREAM_LL LL_DMA_STREAM_6 #define EXTMODULE_USART_TX_DMA_FLAG_TC DMA_FLAG_TCIF6 #define EXTMODULE_USART_RX_DMA_CHANNEL DMA_Channel_5 #define EXTMODULE_USART_RX_DMA_STREAM DMA2_Stream1