Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

Removed redundant preprocessor defs for UART AF

Browse source
This commit is contained in:
Andrey Mironov 2018-09-09 13:36:25 +03:00
parent d6861b0842
commit 501f4a1345
6 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/drivers/serial_uart_impl.h
View file

@ -162,12 +162,8 @@ extern const uartHardware_t uartHardware[];
typedef struct uartDevice_s { typedef struct uartDevice_s {
uartPort_t port; uartPort_t port;
const uartHardware_t *hardware; const uartHardware_t *hardware;
ioTag_t rx; uartPinDef_t rx;
ioTag_t tx; uartPinDef_t tx;
#if defined(STM32F7)
uint8_t rxAF;
uint8_t txAF;
#endif
volatile uint8_t rxBuffer[UART_RX_BUFFER_SIZE]; volatile uint8_t rxBuffer[UART_RX_BUFFER_SIZE];
volatile uint8_t txBuffer[UART_TX_BUFFER_SIZE]; volatile uint8_t txBuffer[UART_TX_BUFFER_SIZE];
} uartDevice_t; } uartDevice_t;

12
src/main/drivers/serial_uart_pinconfig.c
View file

@ -53,21 +53,15 @@ void uartPinConfigure(const serialPinConfig_t *pSerialPinConfig)
for (int pindex = 0 ; pindex < UARTHARDWARE_MAX_PINS ; pindex++) { for (int pindex = 0 ; pindex < UARTHARDWARE_MAX_PINS ; pindex++) {
if (hardware->rxPins[pindex].pin == pSerialPinConfig->ioTagRx[device]) { if (hardware->rxPins[pindex].pin == pSerialPinConfig->ioTagRx[device]) {
uartdev->rx = pSerialPinConfig->ioTagRx[device]; uartdev->rx = hardware->rxPins[pindex];
#if defined(STM32F7)
uartdev->rxAF = hardware->rxPins[pindex].af;
#endif
} }
if (hardware->txPins[pindex].pin == pSerialPinConfig->ioTagTx[device]) { if (hardware->txPins[pindex].pin == pSerialPinConfig->ioTagTx[device]) {
uartdev->tx = pSerialPinConfig->ioTagTx[device]; uartdev->tx = hardware->txPins[pindex];
#if defined(STM32F7)
uartdev->txAF = hardware->txPins[pindex].af;
#endif
} }
} }
if (uartdev->rx || uartdev->tx) { if (uartdev->rx.pin || uartdev->tx.pin) {
uartdev->hardware = hardware; uartdev->hardware = hardware;
uartDevmap[device] = uartdev++; uartDevmap[device] = uartdev++;
} }

4
src/main/drivers/serial_uart_stm32f10x.c
View file

@ -157,8 +157,8 @@ uartPort_t *serialUART(UARTDevice_e device, uint32_t baudRate, portMode_e mode,
s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->DR; s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->DR;
} }
IO_t rxIO = IOGetByTag(uartdev->rx); IO_t rxIO = IOGetByTag(uartdev->rx.pin);
IO_t txIO = IOGetByTag(uartdev->tx); IO_t txIO = IOGetByTag(uartdev->tx.pin);
if (options & SERIAL_BIDIR) { if (options & SERIAL_BIDIR) {
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(device)); IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(device));

2
src/main/drivers/serial_uart_stm32f30x.c
View file

@ -242,7 +242,7 @@ uartPort_t *serialUART(UARTDevice_e device, uint32_t baudRate, portMode_e mode,
s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->TDR; s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->TDR;
} }
serialUARTInitIO(IOGetByTag(uartDev->tx), IOGetByTag(uartDev->rx), mode, options, hardware->af, device); serialUARTInitIO(IOGetByTag(uartDev->tx.pin), IOGetByTag(uartDev->rx.pin), mode, options, hardware->af, device);
if (!s->rxDMAChannel || !s->txDMAChannel) { if (!s->rxDMAChannel || !s->txDMAChannel) {
NVIC_InitTypeDef NVIC_InitStructure; NVIC_InitTypeDef NVIC_InitStructure;

4
src/main/drivers/serial_uart_stm32f4xx.c
View file

@ -234,8 +234,8 @@ uartPort_t *serialUART(UARTDevice_e device, uint32_t baudRate, portMode_e mode,
s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->DR; s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->DR;
} }
IO_t txIO = IOGetByTag(uart->tx); IO_t txIO = IOGetByTag(uart->tx.pin);
IO_t rxIO = IOGetByTag(uart->rx); IO_t rxIO = IOGetByTag(uart->rx.pin);
if (hardware->rcc) { if (hardware->rcc) {
RCC_ClockCmd(hardware->rcc, ENABLE); RCC_ClockCmd(hardware->rcc, ENABLE);

10
src/main/drivers/serial_uart_stm32f7xx.c
View file

@ -441,8 +441,8 @@ uartPort_t *serialUART(UARTDevice_e device, uint32_t baudRate, portMode_e mode,
s->Handle.Instance = hardware->reg; s->Handle.Instance = hardware->reg;
IO_t txIO = IOGetByTag(uartdev->tx); IO_t txIO = IOGetByTag(uartdev->tx.pin);
IO_t rxIO = IOGetByTag(uartdev->rx); IO_t rxIO = IOGetByTag(uartdev->rx.pin);
if ((options & SERIAL_BIDIR) && txIO) { if ((options & SERIAL_BIDIR) && txIO) {
ioConfig_t ioCfg = IO_CONFIG( ioConfig_t ioCfg = IO_CONFIG(
@ -452,17 +452,17 @@ uartPort_t *serialUART(UARTDevice_e device, uint32_t baudRate, portMode_e mode,
); );
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(device)); IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(device));
IOConfigGPIOAF(txIO, ioCfg, uartdev->txAF); IOConfigGPIOAF(txIO, ioCfg, uartdev->tx.af);
} }
else { else {
if ((mode & MODE_TX) && txIO) { if ((mode & MODE_TX) && txIO) {
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(device)); IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(device));
IOConfigGPIOAF(txIO, IOCFG_AF_PP, uartdev->txAF); IOConfigGPIOAF(txIO, IOCFG_AF_PP, uartdev->tx.af);
} }
if ((mode & MODE_RX) && rxIO) { if ((mode & MODE_RX) && rxIO) {
IOInit(rxIO, OWNER_SERIAL_RX, RESOURCE_INDEX(device)); IOInit(rxIO, OWNER_SERIAL_RX, RESOURCE_INDEX(device));
IOConfigGPIOAF(rxIO, IOCFG_AF_PP, uartdev->rxAF); IOConfigGPIOAF(rxIO, IOCFG_AF_PP, uartdev->rx.af);
} }
} }