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

Priority bit masking in STM32 serial drivers. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9632 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2016-06-16 11:56:43 +00:00
parent 6ec0150086
commit 7e6efe12f0
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.c
View File

@ -120,6 +120,15 @@ static void usart_init(SerialDriver *sdp, const SerialConfig *config) {
u->SR = 0;
(void)u->SR; /* SR reset step 1.*/
(void)u->DR; /* SR reset step 2.*/
/* Deciding mask to be applied on the data register on receive, this is
required in order to mask out the parity bit.*/
if ((config->cr1 & (USART_CR1_M | USART_CR1_PCE)) == USART_CR1_PCE) {
sdp->rxmask = 0x7F;
}
else {
sdp->rxmask = 0xFF;
}
}
/**
@ -182,7 +191,7 @@ static void serve_interrupt(SerialDriver *sdp) {
/* Error condition detection.*/
if (sr & (USART_SR_ORE | USART_SR_NE | USART_SR_FE | USART_SR_PE))
set_error(sdp, sr);
b = u->DR;
b = (uint8_t)u->DR & sdp->rxmask;
if (sr & USART_SR_RXNE)
sdIncomingDataI(sdp, b);
sr = u->SR;

4
os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h
View File

@ -300,7 +300,9 @@ typedef struct {
uint8_t ob[SERIAL_BUFFERS_SIZE]; \
/* End of the mandatory fields.*/ \
/* Pointer to the USART registers block.*/ \
USART_TypeDef *usart;
USART_TypeDef *usart; \
/* Mask to be applied on received frames.*/ \
uint8_t rxmask;
/*===========================================================================*/
/* Driver macros. */

20
os/hal/ports/STM32/LLD/USARTv2/hal_serial_lld.c
View File

@ -147,6 +147,24 @@ static void usart_init(SerialDriver *sdp, const SerialConfig *config) {
USART_CR1_RXNEIE | USART_CR1_TE |
USART_CR1_RE;
u->ICR = 0xFFFFFFFFU;
/* Deciding mask to be applied on the data register on receive, this is
required in order to mask out the parity bit.*/
if ((config->cr1 & USART_CR1_PCE) != 0U) {
switch (config->cr1 & (USART_CR1_M_1 | USART_CR1_M_0)) {
case 0:
sdp->rxmask = 0x7F;
break;
case USART_CR1_M_1:
sdp->rxmask = 0x3F;
break;
default:
sdp->rxmask = 0xFF;
}
}
else {
sdp->rxmask = 0xFF;
}
}
/**
@ -212,7 +230,7 @@ static void serve_interrupt(SerialDriver *sdp) {
/* Data available.*/
if (isr & USART_ISR_RXNE) {
osalSysLockFromISR();
sdIncomingDataI(sdp, (uint8_t)u->RDR);
sdIncomingDataI(sdp, (uint8_t)u->RDR & sdp->rxmask);
osalSysUnlockFromISR();
}

4
os/hal/ports/STM32/LLD/USARTv2/hal_serial_lld.h
View File

@ -336,7 +336,9 @@ typedef struct {
/* Pointer to the USART registers block.*/ \
USART_TypeDef *usart; \
/* Clock frequency for the associated USART/UART.*/ \
uint32_t clock;
uint32_t clock; \
/* Mask to be applied on received frames.*/ \
uint8_t rxmask;
/*===========================================================================*/
/* Driver macros. */