diff --git a/ChangeLog b/ChangeLog
index 6dc90caaa8d632f4a42f08cc9a84f2b25bf38b64..e52087f32df31bb96a1afd554258f059faefe99d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -969,6 +969,8 @@
attempts to mount at the location to fail (reporting that the node
already exists). This is a probably for block drivers for removable
media: The bind method could fail repeatedly until media is asserted.
+ * arch/arm/src/stm32/chip.h & stm32_dma.c -- Fixed several definitions
+ that can cause compilation errors when DMA2 is enabled.
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 28fe87dde2a4a442efe93cb71f8f34cef1548646..359a158ffecdd7593742122f87fc67b0c4be29fd 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: November 18, 2009</p>
+ <p>Last Updated: November 21, 2009</p>
</td>
</tr>
</table>
@@ -1617,6 +1617,8 @@ nuttx-0.4.14 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
attempts to mount at the location to fail (reporting that the node
already exists). This is a probably for block drivers for removable
media: The bind method could fail repeatedly until media is asserted.
+ * arch/arm/src/stm32/chip.h & stm32_dma.c -- Fixed several definitions
+ that can cause compilation errors when DMA2 is enabled.
pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/arch/arm/src/stm32/chip.h b/arch/arm/src/stm32/chip.h
index c58331d7b60398bde7617a16912cd592b01ec2de..07109b44d13efee9a70c99ee590f0ca30f58488e 100755
--- a/arch/arm/src/stm32/chip.h
+++ b/arch/arm/src/stm32/chip.h
@@ -57,11 +57,12 @@
# define STM32_NATIM 1 /* One advanced timers TIM1 */
# define STM32_NGTIM 4 /* General timers TIM2,3,4,5 */
# define STM32 NBTIM 0 /* No basic timers */
+# define STM32_NDMA 2 /* DMA1-2 */
# define STM32_NSPI 2 /* SPI1-2 */
# define STM32_NUSART 3 /* USART1-3 */
# define STM32_NI2C 2 /* I2C1-2 */
# define STM32_NCAN 1 /* bxCAN1 */
-# define STM32_NSDIO 1 /* 1 */
+# define STM32_NSDIO 1 /* SDIO */
# define STM32_NGPIO 112 /* GPIOA-G */
# define STM32_NADC 1 /* ADC1 */
# define STM32_NDAC 0 /* No DAC */
diff --git a/arch/arm/src/stm32/stm32_dma.c b/arch/arm/src/stm32/stm32_dma.c
index 320d3a558fd4a850a8327d8bb7043163b0a47798..7fc5cb6f550946efc394867b468bd9de3526cc4a 100755
--- a/arch/arm/src/stm32/stm32_dma.c
+++ b/arch/arm/src/stm32/stm32_dma.c
@@ -145,12 +145,20 @@ static struct stm32_dma_s g_dma[DMA_NCHANNELS] =
},
{
.chan = STM32_DMA2_CHAN4,
+#ifdef CONFIG_STM32_CONNECTIVITY_LINE
.irq = STM32_IRQ_DMA2CH4,
+#else
+ .irq = STM32_IRQ_DMA2CH45,
+#endif
.base = STM32_DMA2_BASE + STM32_DMACHAN_OFFSET(3),
},
{
.chan = STM32_DMA2_CHAN5,
+#ifdef CONFIG_STM32_CONNECTIVITY_LINE
.irq = STM32_IRQ_DMA2CH5,
+#else
+ .irq = STM32_IRQ_DMA2CH45,
+#endif
.base = STM32_DMA2_BASE + STM32_DMACHAN_OFFSET(4),
},
#endif
@@ -241,7 +249,11 @@ static int stm32_dmainterrupt(int irq, void *context)
}
else
#if STM32_NDMA > 1
+#ifdef CONFIG_STM32_CONNECTIVITY_LINE
if (irq >= STM32_IRQ_DMA2CH1 && irq <= STM32_IRQ_DMA2CH5)
+#else
+ if (irq >= STM32_IRQ_DMA2CH1 && irq <= STM32_IRQ_DMA2CH45)
+#endif
{
chan = irq - STM32_IRQ_DMA2CH1 + DMA1_NCHANNELS;
}
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index bb10abdc58f682df5cd8ac00d0dc60e27211578c..f5f68f973adc4b77dcf4e2ebdd58b03a217d7e67 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -72,6 +72,10 @@
# undef CONFIG_SDIO_DMA
#endif
+#ifndef CONFIG_SDIO_DMA
+# warning "Large Non-DMA transfer may result in RX overrun failures"
+#endif
+
#ifndef CONFIG_SCHED_WORKQUEUE
# error "Callback support requires CONFIG_SCHED_WORKQUEUE"
#endif
@@ -941,13 +945,14 @@ static int stm32_interrupt(int irq, void *context)
stm32_endtransfer(priv, OK);
}
- /* Handler data block send/receive CRC failure */
+ /* Handle data block send/receive CRC failure */
else if ((pending & SDIO_STA_DCRCFAIL) != 0)
{
/* Terminate the transfer with an error */
putreg32(SDIO_ICR_DCRCFAILC, STM32_SDIO_ICR);
+ flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, -EIO);
}
@@ -958,6 +963,7 @@ static int stm32_interrupt(int irq, void *context)
/* Terminate the transfer with an error */
putreg32(SDIO_ICR_DTIMEOUTC, STM32_SDIO_ICR);
+ flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, -ETIMEDOUT);
}
@@ -968,6 +974,7 @@ static int stm32_interrupt(int irq, void *context)
/* Terminate the transfer with an error */
putreg32(SDIO_ICR_RXOVERRC, STM32_SDIO_ICR);
+ flldbg("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, -EOVERFLOW);
}
@@ -978,6 +985,7 @@ static int stm32_interrupt(int irq, void *context)
/* Terminate the transfer with an error */
putreg32(SDIO_ICR_TXUNDERRC, STM32_SDIO_ICR);
+ flldbg("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, -EOVERFLOW);
}
@@ -988,6 +996,7 @@ static int stm32_interrupt(int irq, void *context)
/* Terminate the transfer with an error */
putreg32(SDIO_ICR_STBITERRC, STM32_SDIO_ICR);
+ flldbg("ERROR: Start bit, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, -EIO);
}
}
@@ -1297,12 +1306,12 @@ static void stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 arg)
cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT;
regval |= cmdidx | SDIO_CMD_CPSMEN;
+ fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, getreg32(STM32_SDIO_CMD));
+
/* Write the SDIO CMD */
putreg32(SDIO_RESPDONE_ICR|SDIO_CMDDONE_ICR, STM32_SDIO_ICR);
putreg32(regval, STM32_SDIO_CMD);
- fvdbg("cmd: %08x arg: %08x regval: %08x\n",
- cmd, arg, getreg32(STM32_SDIO_CMD));
}
/****************************************************************************