SAMA5D3: Fix some typos in last blind changes backported from the SAM4e. And verified

3 files changed, 20 insertions, 2 deletions

diff --git a/nuttx/arch/arm/src/sama5/sam_lowputc.c b/nuttx/arch/arm/src/sama5/sam_lowputc.c
index ea8a3b070..ba2edff91 100644
--- a/nuttx/arch/arm/src/sama5/sam_lowputc.c
+++ b/nuttx/arch/arm/src/sama5/sam_lowputc.c
@@ -254,7 +254,7 @@ void up_lowputc(char ch)
     {
       /* Wait for the transmitter to be available */
 
-      while (((getreg32(SAM_CONSOLE_VBASE + SAM_UART_SR_OFFSET) &
+      while ((getreg32(SAM_CONSOLE_VBASE + SAM_UART_SR_OFFSET) &
         UART_INT_TXEMPTY) == 0);
 
       /* Disable interrupts so that the test and the transmission are
diff --git a/nuttx/arch/arm/src/sama5/sam_udphs.c b/nuttx/arch/arm/src/sama5/sam_udphs.c
index ca60c6993..8f324ac1a 100644
--- a/nuttx/arch/arm/src/sama5/sam_udphs.c
+++ b/nuttx/arch/arm/src/sama5/sam_udphs.c
@@ -3373,6 +3373,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
                             bool last)
 {
   struct sam_ep_s *privep = (struct sam_ep_s *)ep;
+  struct sam_usbdev_s *priv;
   int ret;
 
   /* Verify parameters.  Endpoint 0 is not available at this interface */
@@ -3394,6 +3395,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
        * configured.
        */
 
+      priv           = privep->dev;
       priv->devstate = UDPHS_DEVSTATE_CONFIGURED;
     }
 
diff --git a/nuttx/configs/sam4e-ek/README.txt b/nuttx/configs/sam4e-ek/README.txt
index 25438c6ef..a1a5d4116 100644
--- a/nuttx/configs/sam4e-ek/README.txt
+++ b/nuttx/configs/sam4e-ek/README.txt
@@ -622,7 +622,9 @@ USB Full-Speed Device
       CONFIG_USBMSC=y                       : Enable the USB MSC class driver
       CONFIG_USBMSC_EPBULKOUT=1             : Use EP1 for the BULK OUT endpoint
       CONFIG_USBMSC_EPBULKIN=2              : Use EP2 for the BULK IN endpoint
-                                            : Defaults for other settings?
+      CONFIG_USBMSC_BULKINREQLEN=64         : (Defaults for full speed)
+      CONFIG_USBMSC_BULKOUTREQLEN=64        :
+                                            : Defaults for other settings as well?
     Board Selection
       CONFIG_SAM4EEK_AT25_BLOCKDEVICE=y     : Export AT25 serial FLASH device
       CONFIG_SAM4EEK_HSMCI_BLOCKDEVICE=n    : Don't export HSMCI SD card
@@ -667,6 +669,15 @@ USB Full-Speed Device
          first have to use mkrd to create the RAM disk and mkfatfs to put
          a FAT file system on it.
 
+  STATUS:
+
+  2014-3-25:  Marginally functional. Very slow to come up.  USB analyzer
+              shows several resets before the host decides that it is
+              happy with the device.  There are no obvious errors in the
+              USB data capture.
+  2014-3-25:  There also seem to be issues about writing files.  This
+              needs more investigation.
+
   CDC/ACM Serial Device Class
   ---------------------------
 
@@ -703,6 +714,11 @@ USB Full-Speed Device
      than requires that you first install a serial driver (a .inf file).  There
      are example .inf files for NuttX in the nuttx/configs/spark directories.
 
+  STATUS:
+
+  2013-2-23:  Checks out OK.  See discussion of the usbnsh configuration
+              below.
+
   Debugging USB Device
   --------------------