From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期四, 12 六月 2025 14:00:43 +0800 Subject: [PATCH] 修改合并错误 --- keil/include/drivers/mk_dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keil/include/drivers/mk_dma.c b/keil/include/drivers/mk_dma.c index b74ea5d..c9f4171 100644 --- a/keil/include/drivers/mk_dma.c +++ b/keil/include/drivers/mk_dma.c @@ -104,11 +104,11 @@ } uint32_t get_uart1_dma_cndtr(void) { -return dma_handle[DMA_ID0].base->CH[6].DATA_SIZE; + return dma_handle[DMA_ID0].base->CH[6].DATA_SIZE; } uint32_t get_uart0_dma_cndtr(void) { -return dma_handle[DMA_ID0].base->CH[4].DATA_SIZE; + return dma_handle[DMA_ID0].base->CH[4].DATA_SIZE; } int dma_transfer(enum DMA_CH_T ch, void *src_addr, void *dst_addr, uint32_t size, drv_callback_t callback) -- Gitblit v1.9.3