andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #851. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10284 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2017-07-02 06:40:46 +00:00
parent f3c59270de
commit c6d3697eda
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os/hal/ports/STM32/LLD/USARTv2/hal_uart_lld.c
View File

@ -127,6 +127,11 @@
#define UART8 USART8 #define UART8 USART8
#endif #endif
/* Workaround for more differences in headers.*/
#if !defined(USART_CR1_M0)
#define USART_CR1_M0 USART_CR1_M
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
/*===========================================================================*/ /*===========================================================================*/
@ -845,7 +850,7 @@ void uart_lld_start(UARTDriver *uartp) {
/* Static DMA setup, the transfer size depends on the USART settings, /* Static DMA setup, the transfer size depends on the USART settings,
it is 16 bits if M=1 and PCE=0 else it is 8 bits.*/ it is 16 bits if M=1 and PCE=0 else it is 8 bits.*/
if ((uartp->config->cr1 & (USART_CR1_M | USART_CR1_PCE)) == USART_CR1_M) if ((uartp->config->cr1 & (USART_CR1_M | USART_CR1_PCE)) == USART_CR1_M0)
uartp->dmamode |= STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD; uartp->dmamode |= STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
dmaStreamSetPeripheral(uartp->dmarx, &uartp->usart->RDR); dmaStreamSetPeripheral(uartp->dmarx, &uartp->usart->RDR);
dmaStreamSetPeripheral(uartp->dmatx, &uartp->usart->TDR); dmaStreamSetPeripheral(uartp->dmatx, &uartp->usart->TDR);

2
readme.txt
View File

@ -88,6 +88,8 @@
***************************************************************************** *****************************************************************************
*** Next *** *** Next ***
- HAL: Fixed wrong frame size code in STM32 USARTv2 UART driver (bug #851)
(backported to 17.6.1 and 16.1.9).
- NIL: Fixed documentation-related issues (bug #850)(backported to 17.6.1). - NIL: Fixed documentation-related issues (bug #850)(backported to 17.6.1).
- RT: Fixed documentation-related issues (bug #850)(backported to 17.6.1). - RT: Fixed documentation-related issues (bug #850)(backported to 17.6.1).
- RT: Fixed leftover chcustomer.h file (bug #849)(backported to 17.6.1). - RT: Fixed leftover chcustomer.h file (bug #849)(backported to 17.6.1).