mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-26 03:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

stm32-f4discovery-cc256x: sttm32f4xx_hal_uart - add critical section, avoid dropping rx byte on rx start

Browse Source
This commit is contained in:
Matthias Ringwald 2019-03-08 22:29:51 +01:00
parent 0166bf8419
commit bef4d37c6d
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
port/stm32-f4discovery-cc256x-2/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c
View File

@ -1320,10 +1320,23 @@ HAL_StatusTypeDef HAL_UART_Transmit_DMA(UART_HandleTypeDef *huart, uint8_t *pDat
/* Process Unlocked */
__HAL_UNLOCK(huart);
//
// BK: SET_BIT is not IRQ-safe. If CR1 is modified from an IRQ, this change could get overwritten by SET_BIT
//
// fix: use critical section to modify control registers
// begin critical section - assumes IRQs are enabled (which holds true for calls from BTstack btstack_uart_block_embedded.c)
__disable_irq();
/* Enable the DMA transfer for transmit request by setting the DMAT bit
in the UART CR3 register */
SET_BIT(huart->Instance->CR3, USART_CR3_DMAT);
// end critical section
__enable_irq();
// BK: end fix
return HAL_OK;
}
else
@ -1378,12 +1391,24 @@ HAL_StatusTypeDef HAL_UART_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pData
tmp = (uint32_t *)&pData;
HAL_DMA_Start_IT(huart->hdmarx, (uint32_t)&huart->Instance->DR, *(uint32_t *)tmp, Size);
/* Clear the Overrun flag just before enabling the DMA Rx request: can be mandatory for the second transfer */
__HAL_UART_CLEAR_OREFLAG(huart);
//
// BK: __HAL_UART_CLEAR_OREFLAG (also) reads Data Register -> loosing an already received byte
//
// /* Clear the Overrun flag just before enabling the DMA Rx request: can be mandatory for the second transfer */
// __HAL_UART_CLEAR_OREFLAG(huart);
//
/* Process Unlocked */
__HAL_UNLOCK(huart);
//
// BK: SET_BIT is not IRQ-safe. If CR1 is modified from an IRQ, this change could get overwritten by SET_BIT
//
// fix: use critical section to modify control registers
// begin critical section - assumes IRQs are enabled (which holds true for calls from BTstack btstack_uart_block_embedded.c)
__disable_irq();
/* Enable the UART Parity Error Interrupt */
SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
@ -1394,6 +1419,11 @@ HAL_StatusTypeDef HAL_UART_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pData
in the UART CR3 register */
SET_BIT(huart->Instance->CR3, USART_CR3_DMAR);
// end critical section
__enable_irq();
// BK: end fix
return HAL_OK;
}
else