Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[XDMAC] Add missing interrupt events to interrupt handler #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −19
Open

[XDMAC] Add missing interrupt events to interrupt handler #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 51 additions & 18 deletions peripheral/xdmac_11161/templates/plib_xdmac.c.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ void ${DMA_INSTANCE_NAME}_InterruptHandler( void )
XDMAC_CH_OBJECT *xdmacChObj = (XDMAC_CH_OBJECT *)&xdmacChannelObj[0];
uint8_t channel = 0U;
volatile uint32_t chanIntStatus = 0U;
XDMAC_TRANSFER_EVENT event = XDMAC_TRANSFER_NONE;

/* Iterate all channels */
for (channel = 0U; channel < XDMAC_ACTIVE_CHANNELS_MAX; channel++)
{
event = XDMAC_TRANSFER_NONE;
/* Process events only channels that are active and has global interrupt enabled */
if ((1 == xdmacChObj->inUse)${SECURE_INTERRUPT_AVAILABLE?string("&& !xdmacChObj->isSecure", "")} && (${DMA_INSTANCE_NAME}_REGS->XDMAC_GIM & (XDMAC_GIM_IM0_Msk << channel)) )
{
Expand All @@ -99,22 +101,37 @@ void ${DMA_INSTANCE_NAME}_InterruptHandler( void )

if (chanIntStatus & ( XDMAC_CIS_RBEIS_Msk | XDMAC_CIS_WBEIS_Msk | XDMAC_CIS_ROIS_Msk))
{
xdmacChObj->busyStatus = false;

/* It's an error interrupt */
if (NULL != xdmacChObj->callback)
{
xdmacChObj->callback(XDMAC_TRANSFER_ERROR, xdmacChObj->context);
}
event = XDMAC_TRANSFER_ERROR;
}
else if (chanIntStatus & XDMAC_CIS_BIS_Msk)
{
xdmacChObj->busyStatus = false;

/* It's a block transfer complete interrupt */
event = XDMAC_TRANSFER_COMPLETE;
}
else if (chanIntStatus & XDMAC_CIS_LIS_Msk)
{
/* It's an end of linked list interrupt */
event = XDMAC_TRANSFER_LINKED_LIST_END;
}
else if (chanIntStatus & XDMAC_CIS_FIS_Msk)
{
/* It's an end of flush operation interrupt */
event = XDMAC_TRANSFER_FLUSH_END;
}

if (event != XDMAC_TRANSFER_NONE) {
/* a flush event may occur while a DMA transfer is still running. Therefore don't
* reset the busyStatus in this case.
*/
if (event != XDMAC_TRANSFER_FLUSH_END)
{
xdmacChObj->busyStatus = false;
}

if (NULL != xdmacChObj->callback)
{
xdmacChObj->callback(XDMAC_TRANSFER_COMPLETE, xdmacChObj->context);
xdmacChObj->callback(event, xdmacChObj->context);
}
}
}
Expand All @@ -130,6 +147,7 @@ void ${DMA_INSTANCE_NAME}_SINT_InterruptHandler( void )
XDMAC_CH_OBJECT *xdmacChObj = (XDMAC_CH_OBJECT *)&xdmacChannelObj[0];
uint8_t channel = 0U;
volatile uint32_t chanIntStatus = 0U;
XDMAC_TRANSFER_EVENT event = XDMAC_TRANSFER_NONE;

/* Iterate all channels */
for (channel = 0U; channel < XDMAC_ACTIVE_CHANNELS_MAX; channel++)
Expand All @@ -142,22 +160,37 @@ void ${DMA_INSTANCE_NAME}_SINT_InterruptHandler( void )

if (chanIntStatus & ( XDMAC_CIS_RBEIS_Msk | XDMAC_CIS_WBEIS_Msk | XDMAC_CIS_ROIS_Msk))
{
xdmacChObj->busyStatus = false;

/* It's an error interrupt */
if (NULL != xdmacChObj->callback)
{
xdmacChObj->callback(XDMAC_TRANSFER_ERROR, xdmacChObj->context);
}
event = XDMAC_TRANSFER_ERROR;
}
else if (chanIntStatus & XDMAC_CIS_BIS_Msk)
{
xdmacChObj->busyStatus = false;

/* It's a block transfer complete interrupt */
event = XDMAC_TRANSFER_COMPLETE;
}
else if (chanIntStatus & XDMAC_CIS_LIS_Msk)
{
/* It's an end of linked list interrupt */
event = XDMAC_TRANSFER_LINKED_LIST_END;
}
else if (chanIntStatus & XDMAC_CIS_FIS_Msk)
{
/* It's an end of flush operation interrupt */
event = XDMAC_TRANSFER_FLUSH_END;
}

if (event != XDMAC_TRANSFER_NONE) {
/* a flush event may occur while a DMA transfer is still running. Therefore don't
* reset the busyStatus in this case.
*/
if (event != XDMAC_TRANSFER_FLUSH_END)
{
xdmacChObj->busyStatus = false;
}

if (NULL != xdmacChObj->callback)
{
xdmacChObj->callback(XDMAC_TRANSFER_COMPLETE, xdmacChObj->context);
xdmacChObj->callback(event, xdmacChObj->context);
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion peripheral/xdmac_11161/templates/plib_xdmac_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,13 @@ typedef enum
XDMAC_TRANSFER_COMPLETE = 1,

/* Error while processing the request */
XDMAC_TRANSFER_ERROR = 2
XDMAC_TRANSFER_ERROR = 2,

/* Reached end of linked list */
XDMAC_TRANSFER_LINKED_LIST_END = 3,

/* Requested flush operation has ended */
XDMAC_TRANSFER_FLUSH_END = 4

} XDMAC_TRANSFER_EVENT;

Expand Down