This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit dabd835bb7bcb18b97048bd56fb0a06d4c7649a7 Author: Masayuki Ishikawa <[email protected]> AuthorDate: Fri Feb 5 10:08:28 2021 +0900 arch: imxrt: Fix style warnings in imxrt_edma.[c,h] Summary: - This commit fixes style warnings in imxrt_edna.[c,y] Impact: - None Testing: - N/A Signed-off-by: Masayuki Ishikawa <[email protected]> --- arch/arm/src/imxrt/imxrt_edma.c | 10 ++++++---- arch/arm/src/imxrt/imxrt_edma.h | 17 ++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c index 3705b6e..4067144 100644 --- a/arch/arm/src/imxrt/imxrt_edma.c +++ b/arch/arm/src/imxrt/imxrt_edma.c @@ -92,7 +92,9 @@ # define EDMA_ALIGN_UP(n) (((n) + EDMA_ALIGN_MASK) & ~EDMA_ALIGN_MASK) #else -/* Special alignment is not required in this case, but we will align to 8-bytes */ +/* Special alignment is not required in this case, + * but we will align to 8-bytes + */ # define EDMA_ALIGN 8 # define EDMA_ALIGN_MASK 7 @@ -511,7 +513,7 @@ static void imxrt_dmaterminate(struct imxrt_dmach_s *dmach, int result) /* Check for an Rx (memory-to-peripheral/memory-to-memory) DMA transfer */ - if (dmach->ttype == eDMA_MEM2MEM || dmach->ttype == eDMA_PERIPH2MEM) + if (dmach->ttype == EDMA_MEM2MEM || dmach->ttype == EDMA_PERIPH2MEM) { /* Invalidate the cache to force reloads from memory. */ #warning Missing logic @@ -1144,7 +1146,7 @@ int imxrt_dmach_xfrsetup(DMACH_HANDLE *handle, /* Check for an Rx (memory-to-peripheral/memory-to-memory) DMA transfer */ - if (dmach->ttype == eDMA_MEM2MEM || dmach->ttype == eDMA_PERIPH2MEM) + if (dmach->ttype == EDMA_MEM2MEM || dmach->ttype == EDMA_PERIPH2MEM) { /* Invalidate caches associated with the destination DMA memory. * REVISIT: nbytes is the number of bytes transferred on each @@ -1158,7 +1160,7 @@ int imxrt_dmach_xfrsetup(DMACH_HANDLE *handle, /* Check for an Tx (peripheral-to-memory/memory-to-memory) DMA transfer */ - if (dmach->ttype == eDMA_MEM2MEM || dmach->ttype == eDMA_MEM2PERIPH) + if (dmach->ttype == EDMA_MEM2MEM || dmach->ttype == EDMA_MEM2PERIPH) { /* Clean caches associated with the source DMA memory. * REVISIT: nbytes is the number of bytes transferred on each diff --git a/arch/arm/src/imxrt/imxrt_edma.h b/arch/arm/src/imxrt/imxrt_edma.h index ac3aef4..0c03b4d 100644 --- a/arch/arm/src/imxrt/imxrt_edma.h +++ b/arch/arm/src/imxrt/imxrt_edma.h @@ -124,15 +124,16 @@ ************************************************************************************/ typedef FAR void *DMACH_HANDLE; -typedef void (*edma_callback_t)(DMACH_HANDLE handle, void *arg, bool done, int result); +typedef void (*edma_callback_t)(DMACH_HANDLE handle, + void *arg, bool done, int result); /* eDMA transfer type */ enum imxrt_edma_xfrtype_e { - eDMA_MEM2MEM = 0, /* Transfer from memory to memory */ - eDMA_PERIPH2MEM, /* Transfer from peripheral to memory */ - eDMA_MEM2PERIPH, /* Transfer from memory to peripheral */ + EDMA_MEM2MEM = 0, /* Transfer from memory to memory */ + EDMA_PERIPH2MEM, /* Transfer from peripheral to memory */ + EDMA_MEM2PERIPH, /* Transfer from memory to peripheral */ }; /* This structure holds the source/destination transfer attribute configuration. */ @@ -158,7 +159,9 @@ struct imxrt_edma_xfrconfig_s #endif }; -/* The following is used for sampling DMA registers when CONFIG DEBUG_DMA is selected */ +/* The following is used for sampling DMA registers + * when CONFIG DEBUG_DMA is selected + */ #ifdef CONFIG_DEBUG_DMA struct imxrt_dmaregs_s @@ -222,7 +225,7 @@ extern "C" * Public Function Prototypes ************************************************************************************/ -/**************************************************************************** +/************************************************************************************ * Name: imxrt_dmach_alloc * * Allocate a DMA channel. This function sets aside a DMA channel, @@ -253,7 +256,7 @@ extern "C" * If a DMA channel is available, this function returns a non-NULL, void* * DMA channel handle. NULL is returned on any failure. * - ****************************************************************************/ + ************************************************************************************/ DMACH_HANDLE imxrt_dmach_alloc(uint32_t dmamux, uint8_t dchpri);
