Skip to content

修复多串口的描述符被覆盖的问题 #6051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Guozhanxin merged 2 commits into from
Jun 9, 2022
Merged

修复多串口的描述符被覆盖的问题 #6051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb51b7d
Update drv_usart.h
ueJone Jun 8, 2022
0e309dc
Update drv_usart.c
ueJone Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions bsp/hc32/libraries/hc32_drivers/drv_usart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,18 +545,17 @@ static void hc32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag)
DMA_Init(uart_dma->Instance, uart_dma->channel, &dma_init);

/* Initialize LLP */
static stc_dma_llp_descriptor_t llp_desc;
llp_init.u32State = DMA_LLP_ENABLE;
llp_init.u32Mode = DMA_LLP_WAIT;
llp_init.u32Addr = (uint32_t)&llp_desc;
llp_init.u32Addr = (uint32_t)&uart->config->llp_desc;
DMA_LlpInit(uart_dma->Instance, uart_dma->channel, &llp_init);

/* Configure LLP descriptor */
llp_desc.SARx = dma_init.u32SrcAddr;
llp_desc.DARx = dma_init.u32DestAddr;
llp_desc.DTCTLx = (dma_init.u32TransCount << DMA_DTCTL_CNT_POS) | (dma_init.u32BlockSize << DMA_DTCTL_BLKSIZE_POS);
llp_desc.LLPx = (uint32_t)&llp_desc;
llp_desc.CHCTLx = (dma_init.u32SrcAddrInc | dma_init.u32DestAddrInc | dma_init.u32DataWidth | \
uart->config->llp_desc.SARx = dma_init.u32SrcAddr;
uart->config->llp_desc.DARx = dma_init.u32DestAddr;
uart->config->llp_desc.DTCTLx = (dma_init.u32TransCount << DMA_DTCTL_CNT_POS) | (dma_init.u32BlockSize << DMA_DTCTL_BLKSIZE_POS);
uart->config->llp_desc.LLPx = (uint32_t)&uart->config->llp_desc;
uart->config->llp_desc.CHCTLx = (dma_init.u32SrcAddrInc | dma_init.u32DestAddrInc | dma_init.u32DataWidth | \
llp_init.u32State | llp_init.u32Mode | dma_init.u32IntEn);

/* Enable DMA interrupt */
Expand Down
1 change: 1 addition & 0 deletions bsp/hc32/libraries/hc32_drivers/drv_usart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ struct hc32_uart_config
struct hc32_uart_irq_config tx_irq;
#ifdef RT_SERIAL_USING_DMA
struct hc32_uart_rxto *rx_timeout;
stc_dma_llp_descriptor_t llp_desc;
struct dma_config *dma_rx;
struct hc32_uart_irq_config *tc_irq;
struct dma_config *dma_tx;
Expand Down