From 902c1342b9426f7f1e335c25b5d63b5ce32e63a3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 18 Jun 2014 08:24:53 -0600 Subject: [PATCH] Cosmetic cleanup --- arch/arm/src/sama5/sam_xdmac.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c index 1bc0242c67..692617221c 100644 --- a/arch/arm/src/sama5/sam_xdmac.c +++ b/arch/arm/src/sama5/sam_xdmac.c @@ -104,11 +104,6 @@ # define CONFIG_SAMA5_NLLDESC SAM_NDMACHAN #endif -/* Register values **********************************************************/ - -#define XDMAC_CH_CC_BOTHDSCR \ - (XDMAC_CH_CC_SRCDSCR | XDMAC_CH_CC_DSTDSCR) - /**************************************************************************** * Private Types ****************************************************************************/ @@ -135,7 +130,7 @@ struct sam_xdmach_s uint32_t cc; /* Pre-calculated CC register for transfer */ dma_callback_t callback; /* Callback invoked when the DMA completes */ void *arg; /* Argument passed to callback function */ - uint32_t rxaddr; /* RX memory address */ + uint32_t rxaddr; /* RX memory address to be invalidated */ size_t rxsize; /* Size of RX memory region */ struct chnext_view1_s *llhead; /* DMA link list head */ struct chnext_view1_s *lltail; /* DMA link list head */ @@ -931,7 +926,8 @@ static size_t sam_maxtransfer(struct sam_xdmach_s *xdmach) * ****************************************************************************/ -static uint32_t sam_ntxtransfers(struct sam_xdmach_s *xdmach, uint32_t dmasize) +static uint32_t sam_ntxtransfers(struct sam_xdmach_s *xdmach, + uint32_t dmasize) { unsigned int srcwidth; @@ -1653,12 +1649,6 @@ static inline int sam_multiple(struct sam_xdmach_s *xdmach) DEBUGASSERT(llhead != NULL && llhead->csa != 0); - /* Check the first and last Channel Control (CC) Register values */ - - DEBUGASSERT((llhead->cc & XDMAC_CH_CC_BOTHDSCR) == 0); - DEBUGASSERT((xdmach->lltail->cc & XDMAC_CH_CC_BOTHDSCR) == - XDMAC_CH_CC_BOTHDSCR); - /* 1. Read the XDMAC Global Channel Status Register (XDMAC_GS) to choose a * free channel. *