Fix SAM bug: Parmaters reversed in DMA function call

5 files changed, 12 insertions, 9 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index af29cb919..f503656f5 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5323,3 +5323,6 @@
 	  correct some bad register address and some bad assertions that caused
 	  false alarms.  These latter were backported to the SAM34 DMAC driver
 	  as well (2013-8-6).
+	* arch/arm/src/sama5/sam_dmac.c and sam34/sam34_dmac.c: Correct
+	  some parameters reversed in function call (2013-8-6).
+
diff --git a/nuttx/arch/arm/src/sam34/sam3u_dmac.c b/nuttx/arch/arm/src/sam34/sam3u_dmac.c
index 3d9708cb7..cf0c8b255 100644
--- a/nuttx/arch/arm/src/sam34/sam3u_dmac.c
+++ b/nuttx/arch/arm/src/sam34/sam3u_dmac.c
@@ -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 */
 
diff --git a/nuttx/arch/arm/src/sam34/sam_hsmci.c b/nuttx/arch/arm/src/sam34/sam_hsmci.c
index ae71b4a33..ee252e578 100644
--- a/nuttx/arch/arm/src/sam34/sam_hsmci.c
+++ b/nuttx/arch/arm/src/sam34/sam_hsmci.c
@@ -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;
diff --git a/nuttx/arch/arm/src/sama5/sam_dmac.c b/nuttx/arch/arm/src/sama5/sam_dmac.c
index 4495209c1..6f19594ab 100644
--- a/nuttx/arch/arm/src/sama5/sam_dmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_dmac.c
@@ -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 */
 
diff --git a/nuttx/arch/arm/src/sama5/sam_hsmci.c b/nuttx/arch/arm/src/sama5/sam_hsmci.c
index 482a7b0e4..cc775b12f 100644
--- a/nuttx/arch/arm/src/sama5/sam_hsmci.c
+++ b/nuttx/arch/arm/src/sama5/sam_hsmci.c
@@ -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;