From cb51b7d2a2a76efd4db9d662946d07795f888ee1 Mon Sep 17 00:00:00 2001 From: ueJone <185099912@qq.com> Date: Wed, 8 Jun 2022 15:19:47 +0800 Subject: [PATCH 1/2] Update drv_usart.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `struct hc32_uart_config`添加连锁描述符`stc_dma_llp_descriptor_t llp_desc` --- bsp/hc32/libraries/hc32_drivers/drv_usart.h | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/hc32/libraries/hc32_drivers/drv_usart.h b/bsp/hc32/libraries/hc32_drivers/drv_usart.h index 4b9ab4ae805..4b70bcdb04d 100644 --- a/bsp/hc32/libraries/hc32_drivers/drv_usart.h +++ b/bsp/hc32/libraries/hc32_drivers/drv_usart.h @@ -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; From 0e309dcddaf2ab17fca0e9ce4efa5e40deb7f473 Mon Sep 17 00:00:00 2001 From: ueJone <185099912@qq.com> Date: Wed, 8 Jun 2022 15:22:32 +0800 Subject: [PATCH 2/2] Update drv_usart.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复使用多串口的描述符被覆盖的问题（连锁描述符由静态变量移到`struct hc32_uart_config`结构体中） --- bsp/hc32/libraries/hc32_drivers/drv_usart.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bsp/hc32/libraries/hc32_drivers/drv_usart.c b/bsp/hc32/libraries/hc32_drivers/drv_usart.c index 15a2107d6dc..582bb343d29 100644 --- a/bsp/hc32/libraries/hc32_drivers/drv_usart.c +++ b/bsp/hc32/libraries/hc32_drivers/drv_usart.c @@ -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 */