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

Fix SAM bug: Parmaters reversed in DMA function call

Browse Source
This commit is contained in:
Gregory Nutt 2013-08-06 15:47:09 -06:00
parent d1da100cf0
commit 159635bc2a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/sam34/sam3u_dmac.c
View File

@ -903,7 +903,7 @@ static int sam_rxbuffer(struct sam_dma_s *dmach, uint32_t paddr,
ctrlb = sam_rxctrlb(dmach);
}
ctrla = sam_rxctrla(dmach, regval, nbytes);
ctrla = sam_rxctrla(dmach, nbytes, regval);
/* Add the new link list entry */
@ -1159,7 +1159,7 @@ static int sam_dmainterrupt(int irq, void *context)
void weak_function up_dmainitialize(void)
{
dmallvdbg("Iinitialize DMAC0\n");
dmallvdbg("Initialize DMAC0\n");
/* Enable peripheral clock */

4
arch/arm/src/sam34/sam_hsmci.c
View File

@ -1108,7 +1108,7 @@ static int sam_interrupt(int irq, void *context)
/* Handle in progress, interrupt driven data transfers ****************/
/* Do any of these interrupts signal the end a data transfer? */
pending = enabled & priv->xfrmask;
pending = enabled & priv->xfrmask;
if (pending != 0)
{
/* Yes.. the transfer is complete. Did it complete with an error? */
@ -1142,7 +1142,7 @@ static int sam_interrupt(int irq, void *context)
/* Handle wait events *************************************************/
/* Do any of these interrupts signal wakeup event? */
pending = enabled & priv->waitmask;
pending = enabled & priv->waitmask;
if (pending != 0)
{
sdio_eventset_t wkupevent = 0;

6
arch/arm/src/sama5/sam_dmac.c
View File

@ -1158,7 +1158,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr,
ctrlb = sam_rxctrlb(dmach);
}
ctrla = sam_rxctrla(dmach, regval, nbytes);
ctrla = sam_rxctrla(dmach, nbytes, regval);
/* Add the new link list entry */
@ -1480,7 +1480,7 @@ void sam_dmainitialize(struct sam_dmac_s *dmac)
void weak_function up_dmainitialize(void)
{
#ifdef CONFIG_SAMA5_DMAC0
dmallvdbg("Iinitialize DMAC0\n");
dmallvdbg("Initialize DMAC0\n");
/* Enable peripheral clock */
@ -1500,7 +1500,7 @@ void weak_function up_dmainitialize(void)
#endif
#ifdef CONFIG_SAMA5_DMAC1
dmallvdbg("Iinitialize DMAC1\n");
dmallvdbg("Initialize DMAC1\n");
/* Enable peripheral clock */

4
arch/arm/src/sama5/sam_hsmci.c
View File

@ -1339,7 +1339,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
/* Handle in progress, interrupt driven data transfers ****************/
/* Do any of these interrupts signal the end a data transfer? */
pending = enabled & priv->xfrmask;
pending = enabled & priv->xfrmask;
if (pending != 0)
{
/* Yes.. the transfer is complete. Did it complete with an error? */
@ -1373,7 +1373,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
/* Handle wait events *************************************************/
/* Do any of these interrupts signal wakeup event? */
pending = enabled & priv->waitmask;
pending = enabled & priv->waitmask;
if (pending != 0)
{
sdio_eventset_t wkupevent = 0;