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

Minor changes in sama_xdmac driver 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10488 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
edolomb 2017-08-25 08:53:22 +00:00
parent ad80a8ed28
commit 686ac77a31
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,18 +94,6 @@ sama_dma_channel_t _sama_dma_channel_t[XDMAC_CHANNELS_TOT];
*/
#define dmaGetGlobalInt(xdmacp) xdmacp->XDMAC_GIS
/**
* @brief Get content of Channel Interrupt Status register.
* @note Reading interrupt is equivalent to clearing interrupt.
*
* @param[in] dmachp pointer to a sama_dma_channel_t structure
* @return XDMAC_CISx content of Channel Interrupt Status register
*
* @notapi
*/
#define dmaGetChannelInt(dmachp) \
(dmachp)->xdmac->XDMAC_CHID[(dmachp)->chid].XDMAC_CIS
/**
* @brief Get content of Channel Interrupt Mask register.
*
@ -144,7 +132,7 @@ OSAL_IRQ_HANDLER(dmaHandler) {
gcs = dmaGetGlobal(xdmac);
for (chan = 0; chan < XDMAC_CHANNELS; chan++) {
sama_dma_channel_t *channel = &_sama_dma_channel_t[(cont * XDMAC_CHANNELS) + chan];
bool pendingInt = false;
bool pendingInt = 0;
if (!(gis & (0x1 << chan)))
/* There is no pending interrupt for this channel */
@ -159,16 +147,16 @@ OSAL_IRQ_HANDLER(dmaHandler) {
if (cis & XDMAC_CIS_BIS) {
if (!(dmaGetChannelIntMask(channel) & XDMAC_CIM_LIM)) {
pendingInt = true;
pendingInt = 1;
}
}
if (cis & XDMAC_CIS_LIS) {
pendingInt = true;
pendingInt = 1;
}
if (cis & XDMAC_CIS_DIS) {
pendingInt = true;;
pendingInt = 1;
}
}
/* Execute callback */

11
os/hal/ports/SAMA/LLD/DMAv1/sama_xdmac.h
View File

@ -110,6 +110,17 @@ typedef struct {
* @name Macro Functions
* @{
*/
/**
* @brief Get content of Channel Interrupt Status register.
* @note Reading interrupt is equivalent to clearing interrupt.
*
* @param[in] dmachp pointer to a sama_dma_channel_t structure
* @return XDMAC_CISx content of Channel Interrupt Status register
*
* @notapi
*/
#define dmaGetChannelInt(dmachp) \
(dmachp)->xdmac->XDMAC_CHID[(dmachp)->chid].XDMAC_CIS
/**
* @brief Associates a source to a DMA channel.