From 0a4a91c0033ac79c8fd345eab1f9b1bdce10b2dd Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Tue, 28 Apr 2020 11:01:05 +0200
Subject: [PATCH] Modified the usart4 module for the F4 family to use the UART
data structures insead of the USART ones.
---
f4/usart/src/usart4.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/f4/usart/src/usart4.c b/f4/usart/src/usart4.c
index 93d59ba..5b325b3 100644
--- a/f4/usart/src/usart4.c
+++ b/f4/usart/src/usart4.c
@@ -111,7 +111,7 @@ void UART_DMA_TX_IRQHandler(void)
__HAL_DMA_DISABLE_IT(Uart4Handle.hdmatx, DMA_IT_TC);
/* Clear the transfer complete flag */
__HAL_DMA_CLEAR_FLAG(Uart4Handle.hdmatx, __HAL_DMA_GET_TC_FLAG_INDEX(Uart4Handle.hdmatx));
- CLEAR_BIT(Uart4Handle.Instance->CR3, (UART_CR3_DMAT | UART_CR3_DMAR));
+ CLEAR_BIT(Uart4Handle.Instance->CR3, (USART_CR3_DMAT | USART_CR3_DMAR));
HAL_DMA_Abort(Uart4Handle.hdmatx);
// call the user function
comm_do_dma_send(usart4_comm_dev);
@@ -149,7 +149,7 @@ void UART_DMA_RX_IRQHandler(void)
__HAL_DMA_DISABLE_IT(Uart4Handle.hdmarx, DMA_IT_TC);
/* Clear the transfer complete flag */
__HAL_DMA_CLEAR_FLAG(Uart4Handle.hdmarx, __HAL_DMA_GET_TC_FLAG_INDEX(Uart4Handle.hdmarx));
- CLEAR_BIT(Uart4Handle.Instance->CR3, (UART_CR3_DMAT | UART_CR3_DMAR));
+ CLEAR_BIT(Uart4Handle.Instance->CR3, (USART_CR3_DMAT | USART_CR3_DMAR));
HAL_DMA_Abort(Uart4Handle.hdmarx);
// call the user function
comm_do_dma_receive(usart4_comm_dev);
@@ -325,7 +325,7 @@ unsigned char usart4_send_dma(unsigned char *data,unsigned short int length)
__HAL_UART_CLEAR_FLAG(&Uart4Handle,UART_FLAG_TC);
/* Enable the DMA transfer for transmit request by setting the DMAT bit
in the UART CR3 register */
- SET_BIT(Uart4Handle.Instance->CR3, UART_CR3_DMAT);
+ SET_BIT(Uart4Handle.Instance->CR3, USART_CR3_DMAT);
return 0x00;
}
@@ -333,14 +333,14 @@ unsigned char usart4_send_dma(unsigned char *data,unsigned short int length)
unsigned char usart4_receive_dma(unsigned char *data,unsigned short int length)
{
HAL_DMA_Start_IT(Uart4Handle.hdmarx,(uint32_t)&Uart4Handle.Instance->DR,(uint32_t)data,length);
- SET_BIT(Uart4Handle.Instance->CR3, UART_CR3_DMAR);
+ SET_BIT(Uart4Handle.Instance->CR3, USART_CR3_DMAR);
return 0x00;
}
unsigned char usart4_cancel_receive_dma(void)
{
- CLEAR_BIT(Uart4Handle.Instance->CR3, (UART_CR3_DMAT | UART_CR3_DMAR));
+ CLEAR_BIT(Uart4Handle.Instance->CR3, (USART_CR3_DMAT | USART_CR3_DMAR));
HAL_DMA_Abort(Uart4Handle.hdmarx);
return 0x00;
--
GitLab