lpc313x update

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2574 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 17 insertions, 24 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index a9b3b1883..1517a6ed4 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -1078,6 +1078,8 @@
 	* Several important compilation error fixes in lpc313x and (dualspeed) USB
 	  code also contributed by David Hewson.
 	* arch/arm/src/sam3u/sam3u_dmac.c - DMA support for the AT90SAM3U.
-	  (incomplete on initial checkin).
+	  (untested on initial checkin).
 	* arch/arm/src/sam3u/sam3u_hsmci.c - SD memory card support for AT90SAM3U
-	  (incomplete on initial checkin).
\ No newline at end of file
+	  (incomplete on initial checkin).
+	* drivers/usbdev - Several important fixes to the USB mass storage driver
+	  submitted by David Hewson.
\ No newline at end of file
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index f79e045f8..267f93e99 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/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: March 28, 2010</p>
+      <p>Last Updated: April 4, 2010</p>
     </td>
   </tr>
 </table>
@@ -1660,9 +1660,10 @@ nuttx-5.3 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	* Several important compilation error fixes in lpc313x and (dualspeed) USB
 	  code also contributed by David Hewson.
 	* arch/arm/src/sam3u/sam3u_dmac.c - DMA support for the AT90SAM3U.
-	  (incomplete on initial checkin).
+	  (untested on initial checkin).
 	* arch/arm/src/sam3u/sam3u_hsmci.c - SD memory card support for AT90SAM3U
 	  (incomplete on initial checkin).
+	* drivers/usbdev - Several important fixes to the USB mass storage driver
 
 pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/nuttx/TODO b/nuttx/TODO
index 3c7ba29cd..9ecf27670 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated December 20, 2009)
+NuttX TODO List (Last updated April 4, 2009)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   (5)  Task/Scheduler (sched/)
@@ -9,7 +9,7 @@ NuttX TODO List (Last updated December 20, 2009)
   (5)  Binary loaders (binfmt/)
  (14)  Network (net/, netutils/)
   (5)  Network Utilities (netutils/)
-  (1)  USB (drivers/usbdev)
+  (0)  USB (drivers/usbdev)
   (5)  Libraries (lib/)
  (11)  File system/Generic drivers (fs/, drivers/)
   (2)  Graphics subystem (graphics/)
@@ -23,7 +23,7 @@ NuttX TODO List (Last updated December 20, 2009)
   (1)  ARM/C5471 (arch/arm/src/c5471/)
   (3)  ARM/DM320 (arch/arm/src/dm320/)
   (2)  ARM/i.MX (arch/arm/src/imx/)
-  (8)  ARM/LPC214x (arch/arm/src/lpc214x/)
+  (7)  ARM/LPC214x (arch/arm/src/lpc214x/)
   (3)  ARM/STR71x (arch/arm/src/str71x/)
   (4)  ARM/LM3S6918 (arch/arm/src/lm3s/)
   (5)  ARM/STM32 (arch/arm/src/stm32/)
@@ -288,14 +288,6 @@ o Network Utilities (netutils/)
 o USB (drivers/usbdev)
   ^^^^^^^^^^^^^^^^^^^^
 
-  Description: The USB bulk storage class driver configuration (examples/usbstorage)
-               does not work reliably when debug is disabled (CONFIG_DEBUG+CONFIG_DEBUG_VERBOSE
-               +CONFIG_DEBUG_USB) on WinXP (Linux appears to be fine).  A race condition would
-               would be a possibility.  The symptom is that that WinXP sends a MODE SENSE (6)
-               command with an unsupported mode page (0x1c/0x00)
-  Status:      Open
-  Priority:    High
-
 o Libraries (lib/)
   ^^^^^^^^^^^^^^^^
 
@@ -611,14 +603,6 @@ o ARM/LPC214x (arch/arm/src/lpc214x/)
   Status:      Open
   Priority:    Low
 
-  Description: The USB bulk storage class driver configuration (examples/usbstorage)
-               does not work reliably when debug is disabled (CONFIG_DEBUG+CONFIG_DEBUG_VERBOSE
-               +CONFIG_DEBUG_USB) on WinXP (Linux appears to be fine).  A race condition would
-               would be a possibility.  The symptom is that that WinXP sends a MODE SENSE (6)
-               command with an unsupported mode page (0x1c/0x00)
-  Status:      Open
-  Priority:    High
-
   Description: At present the SPI driver is polled.  Should it be interrupt driven?
                Look at arch/arm/src/imx/imx_spi.c -- that is a good example of an
                interrupt driven SPI driver.  Should be very easy to part that architecture
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 639b7b914..4347180e1 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * arch/arm/src/lpc214x/lpc214x_usbdev.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_dmac.c b/nuttx/arch/arm/src/sam3u/sam3u_dmac.c
index 489d81bc1..510ac7e8a 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_dmac.c
+++ b/nuttx/arch/arm/src/sam3u/sam3u_dmac.c
@@ -69,6 +69,12 @@
 
 #ifdef CONFIG_SAM3U_DMA
 
+/* If AT90SAM3U support is enabled, then OS DMA support should also be enabled */
+
+#ifndef CONFIG_ARCH_DMA
+#  warning "ATSAM3U DMA enabled but CONFIG_ARCH_DMA disabled"
+#endif
+
 /* Check the number of link list descriptors to allocate */
 
 #ifndef CONFIG_SAM3U_NLLDESC