sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation and fix SAM_DMAC_CHINTENCLR settings

Browse Source
This commit is contained in:
bertrand 2023-11-15 23:18:26 +01:00 committed by Alan Carvalho de Assis
parent 46b8b057da
commit f5374e71f3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/src/samd2l2/sam_dmac.c
View File

@ -137,9 +137,9 @@ static struct sam_dmach_s g_dmach[SAMD2L2_NDMACHAN];
*/
static struct dma_desc_s g_base_desc[SAMD2L2_NDMACHAN]
locate_data(".lpram"), aligned(16);
locate_data(".lpram") aligned_data(16);
static struct dma_desc_s g_writeback_desc[SAMD2L2_NDMACHAN]
locate_data(".lpram"), aligned(16);
locate_data(".lpram") aligned_data(16);
#if CONFIG_SAMD2L2_DMAC_NDESC > 0
/* Additional DMA descriptors for (optional) multi-block transfer support.
@ -147,7 +147,7 @@ static struct dma_desc_s g_writeback_desc[SAMD2L2_NDMACHAN]
*/
static struct dma_desc_s g_dma_desc[CONFIG_SAMD2L2_DMAC_NDESC]
locate_data(".lpram"), aligned(16);
locate_data(".lpram") aligned_data(16);
#endif
/****************************************************************************
@ -178,7 +178,7 @@ static void sam_dmaterminate(struct sam_dmach_s *dmach, int result)
/* Disable all channel interrupts */
putreg8(1 << dmach->dc_chan, SAM_DMAC_CHINTENCLR);
putreg8(DMAC_INT_ALL, SAM_DMAC_CHINTENCLR);
leave_critical_section(flags);
/* Free the DMA descriptor list */
@ -833,7 +833,7 @@ DMA_HANDLE sam_dmachannel(uint32_t chflags)
/* Disable all channel interrupts */
putreg8(1 << chndx, SAM_DMAC_CHINTENCLR);
putreg8(DMAC_INT_ALL, SAM_DMAC_CHINTENCLR);
leave_critical_section(flags);
break;
}

2
arch/arm/src/samd2l2/sam_dmac.h
View File

@ -31,8 +31,6 @@
#include "chip.h"
#include "hardware/sam_dmac.h"
#ifdef CONFIG_SAMD2L2_DMAC
#if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21)