andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup ISR. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11519 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
isiora 2018-02-20 18:20:16 +00:00
parent 6497cd272a
commit a6d67787e4
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
os/hal/ports/SAMA/LLD/DMAv1/sama_xdmac.c
View File

@ -105,32 +105,22 @@ OSAL_IRQ_HANDLER(dmaHandler) {
/* Read Global Interrupt Status Register */ /* Read Global Interrupt Status Register */
gis = dmaGetGlobalInt(xdmac); gis = dmaGetGlobalInt(xdmac);
for (chan = 0; chan < XDMAC_CHANNELS; chan++) { for (chan = 0; gis && (chan < XDMAC_CHANNELS); chan++) {
sama_dma_channel_t *channel = &_sama_dma_channel_t[chan]; sama_dma_channel_t *channel = &_sama_dma_channel_t[chan];
bool pendingInt = FALSE;
if (!(gis & (0x1 << chan))) if (!(gis & (0x1 << chan)))
/* There is no pending interrupt for this channel */ /* There is no pending interrupt for this channel */
continue; continue;
gis &= ~(0x1 << chan);
if (channel->state == SAMA_DMA_FREE) /**
/* Channel is free */ * if channel interrupt is enabled and pending, and a callback exists,
continue; * execute it
*/
uint32_t cis = (dmaGetChannelInt(channel)) & ~(dmaGetChannelIntMask(channel)); uint32_t cis = dmaGetChannelInt(channel) &~ dmaGetChannelIntMask(channel);
if (cis & (XDMAC_CIS_BIS|XDMAC_CIS_LIS|XDMAC_CIS_DIS))
if (cis) { if (channel->dma_func)
pendingInt = TRUE; channel->dma_func(channel->dma_param, cis);
}
if (cis & (XDMAC_CIS_LIS|XDMAC_CIS_DIS)) {
pendingInt = TRUE;
}
/* Executes callback */
if (pendingInt && channel->dma_func) {
channel->dma_func(channel->dma_param,cis);
}
} }
aicAckInt(); aicAckInt();
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
@ -258,13 +248,13 @@ sama_dma_channel_t* dmaChannelAllocate(uint32_t priority,
/* Setting AIC and enabling DMA clocks required by the current channel set.*/ /* Setting AIC and enabling DMA clocks required by the current channel set.*/
#if SAMA_HAL_IS_SECURE #if SAMA_HAL_IS_SECURE
aicSetSourcePriority(ID_XDMAC0, priority); aicSetSourcePriority(ID_XDMAC0, priority);
aicEnableInt(ID_XDMAC0); aicEnableInt(ID_XDMAC0);
pmcEnableXDMAC0(); pmcEnableXDMAC0();
#else #else
aicSetSourcePriority(ID_XDMAC1, priority); aicSetSourcePriority(ID_XDMAC1, priority);
aicEnableInt(ID_XDMAC1); aicEnableInt(ID_XDMAC1);
pmcEnableXDMAC1(); pmcEnableXDMAC1();
#endif /* SAMA_HAL_IS_SECURE */ #endif /* SAMA_HAL_IS_SECURE */
/* Enabling channel's interrupt */ /* Enabling channel's interrupt */