Merged in alinjerpelea/nuttx (pull request #996)

arm: sam34: codestyle fixes * arm: sam34: codestyle fixes After the board restructuration is time for codestyle cleanup Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> * arm: sama5: codestyle fixes After the board restructuration is time for codestyle cleanup Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> Approved-by: Gregory Nutt <gnutt@nuttx.org>
2026-05-31 14:27:37 +08:00 · 2019-08-15 16:19:17 +00:00
parent eb4fff5221
commit 061728b440
237 changed files with 3797 additions and 3154 deletions
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/arduino-due/include/board.h
+/****************************************************************************
+ * boards/arm/sam34/arduino-due/include/board.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_ARDUINO_DUE_INCLUDE_BOARD_H
-#define __BOARDS_ARM_ARDUINO_DUE_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_SAM34_ARDUINO_DUE_INCLUDE_BOARD_H
+#define __BOARDS_ARM_SAM34_ARDUINO_DUE_INCLUDE_BOARD_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -50,18 +50,19 @@
 #  endif
 #endif

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/* Clocking *************************************************************************/
-/* After power-on reset, the SAM3X device is running on a 4MHz internal RC.  These
- * definitions will configure clocking
+/* Clocking *****************************************************************/
+
+/* After power-on reset, the SAM3X device is running on a 4MHz internal RC.
+ * These definitions will configure clocking
 *
- *   MAINOSC:  Frequency = 12MHz (crystal)
- *   PLLA: PLL Divider = 1, Multiplier = 14 to generate PLLACK = 168MHz
- *   Master Clock (MCK): Source = PLLACK, Prescalar = 1 to generate MCK = 84MHz
- *   CPU clock: 84MHz
+ * MAINOSC:  Frequency = 12MHz (crystal)
+ * PLLA: PLL Divider = 1, Multiplier = 14 to generate PLLACK = 168MHz
+ * Master Clock (MCK): Source = PLLACK, Prescalar = 1 to generate MCK = 84MHz
+ * CPU clock: 84MHz
 */

 #define BOARD_32KOSC_FREQUENCY     (32768)
@@ -107,8 +108,8 @@

 /* HSMCI clocking
 *
- * Multimedia Card Interface clock (MCCK or MCI_CK) is Master Clock (MCK)
- * divided by (2*(CLKDIV+1)).
+ * Multimedia Card Interface clock (MCCK or MCI_CK) is Master Clock
+ * (MCK) divided by (2*(CLKDIV+1)).
 *
 *   MCI_SPEED = MCCK / (2*(CLKDIV+1))
 *   CLKDIV = MCCK / MCI_SPEED / 2 - 1
@@ -116,7 +117,9 @@
 * Where CLKDIV has a range of 0-255.
 */

-/* MCK = 84MHz, CLKDIV = 104, MCI_SPEED = 84MHz / 2 * (104+1) = 400 KHz */
+/* MCK = 84MHz, CLKDIV = 104,
+ * MCI_SPEED = 84MHz / 2 * (104+1) = 400 KHz
+ */

 #define HSMCI_INIT_CLKDIV          (104 << HSMCI_MR_CLKDIV_SHIFT)

@@ -143,7 +146,8 @@

 #define BOARD_FWS                  4

-/* LED definitions ******************************************************************/
+/* LED definitions **********************************************************/
+
 /*  There are three user-controllable LEDs on board the Arduino Due board:
 *
 *     LED              GPIO
@@ -178,7 +182,9 @@
 *
 *  SYMBOL                MEANING                         LED STATE
 *                                                         L         TX       RX
- *  -----------------------  --------------------------  -------- -------- --------    */
+ *  -----------------------  --------------------------  -------- -------- --------
+ */
+
 #define LED_STARTED       0  /* NuttX has been started     OFF      OFF      OFF       */
 #define LED_HEAPALLOCATE  0  /* Heap has been allocated    OFF      OFF      OFF       */
 #define LED_IRQSENABLED   0  /* Interrupts enabled         OFF      OFF      OFF       */
@@ -195,15 +201,18 @@
 * at approximately 2Hz, then a fatal error has been detected and the system
 */

-/* Button definitions ***************************************************************/
-/*   There are no buttons on the Arduino Due board. */
+/* Button definitions *******************************************************/

-/* GPIO pin configurations **********************************************************/
+/* There are no buttons on the Arduino Due board. */
+
+/* GPIO pin configurations **************************************************/

 #if 1 /* #ifdef CONFIG_ARDUINO_DUE_REV3 works with REV2 as well */
-/* This port was performed on the Arduino Due Rev 2 board.  A NuttX user reported
- * issues with the serial port on his Aduino Due Rev 3 board.  That problem was
- * resolved as follows:
+
+/* This port was performed on the Arduino Due Rev 2 board.
+ * A NuttX user reported issues with the serial port on his Aduino Due Rev 3
+ * board.
+ * That problem was resolved as follows:
 *
 *  "... The issue was in my hardware. I found the difference between Arduino
 *   Due shematics (revision R2) and actual PCB layout of my Arduino (revision
@@ -223,5 +232,4 @@
 #  define GPIO_UART0_RXD  (GPIO_PERIPHA | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | \
                           GPIO_PIN8 | GPIO_CFG_PULLUP)
 #endif
-
-#endif  /* __BOARDS_ARM_ARDUINO_DUE_INCLUDE_BOARD_H */
+#endif  /* __BOARDS_ARM_SAM34_ARDUINO_DUE_INCLUDE_BOARD_H */
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arduino-due/scripts/Make.defs
+# boards/arm/sam34/arduino-due/scripts/Make.defs
 #
 #   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arduino-due/scripts/arduino-due.ld
+ * boards/arm/sam34/arduino-due/scripts/arduino-due.ld
 *
 *   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arduino-due/src/Makefile
+# boards/arm/sam34/arduino-due/src/Makefile
 #
 #   Copyright (C) 2013, 2018 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/arduino-due/src/arduino-due.h
+/****************************************************************************
+ * boards/arm/sam34/arduino-due/src/arduino-due.h
 *
 *   Copyright (C) 2013, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_ARDUINO_DUE_SRC_ARDUNO_DUE_H
-#define __BOARDS_ARM_ARDUINO_DUE_SRC_ARDUNO_DUE_H
+#ifndef __BOARDS_ARM_SAM34_ARDUINO_DUE_SRC_ARDUNO_DUE_H
+#define __BOARDS_ARM_SAM34_ARDUINO_DUE_SRC_ARDUNO_DUE_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
@@ -50,9 +50,10 @@

 #include "hardware/sam_pinmap.h"

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/
+
 /*  There are three user-controllable LEDs on board the Arduino Due board:
 *
 *     LED              GPIO
@@ -113,10 +114,10 @@
 * The Arduino 2.4" TFT Touch shield uses the S6D1121 controller , it
 * supports 8-bit data interface. The touch IC is TSC2046.
 *
- * ---------- --------------------------- ----------- --------------------------- ------------------
+ * ---------- --------------------------- ----------- --------------------------- ---
 * Arduino            ATSAM3X                 Due             ITHEAD
 * Due PIN    GPIO FUNCTION               SIGNAL      PIN              SIGNAL     NOTES
- * ---------- ---- ---------------------- ----------- ---------------- ---------- ------------------
+ * ---------- ---- ---------------------- ----------- ---------------- ---------- ---
 * PWMH
 * 10  SCL1   PA18 TWCK0/A20/WKUP9        SCL1         ---      ---    ---        SCL not available
 *  9  SDA1   PA17 TWD0SPCK0              SDA1         ---      ---    ---        SDA not available
@@ -138,7 +139,7 @@
 *  3  PWM2   PB25 RTS0/TIOA0             PWM2         J3 pin 3 D2     DB10       ---
 *  2  PWM1   PA9  UTXD/PWMH3             TX           J3 pin 2 D1     DB9        UART0 TX
 *  1  PWM0   PA8  URXD/PWMH0/WKUP4       RX           J3 pin 1 D0     DB8        UART0 RX
- * ---------- ---- ---------------------- ----------- ---------------- ---------- ------------------
+ * ---------- ---- ---------------------- ----------- ---------------- ---------- ---
 * POWER
 *  1  ---    ---  ---                    ---          ---      ---    ---        ---
 *  2  IOref  ---  ---                    IOREF +3V3   ---      ---    ---        ---
@@ -157,7 +158,7 @@
 *  6  A5     PA4  TCLK1/NWAIT/AD2        AD5          J1 pin 1 A5/D19 TFT_RS     ---
 *  7  A6     PA3  TIOB1/PWMFI1/AD1/WKUP1 AD6          ---      ---    ---        ---
 *  8  A7     PA2  TIOA1/NANDRDY/AD0      AD7          ---      ---    ---        ---
- * ---------- ---- ---------------------- ----------- ---------------- ---------- ------------------
+ * ---------- ---- ---------------------- ----------- ---------------- ---------- ---
 *
 * NOTES:
 *
@@ -294,21 +295,21 @@
 #  endif
 #endif

-/************************************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public data
- ************************************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_bringup
 *
 * Description:
@@ -320,39 +321,41 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
 *     Called from the NSH library
 *
- ************************************************************************************/
+ ****************************************************************************/

 int sam_bringup(void);

-/************************************************************************************
+/****************************************************************************
 * Name: sam_sdinitialize
 *
 * Description:
 *   Initialize the SPI-based SD card.
 *
- ************************************************************************************/
+ ****************************************************************************/

 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
    defined(CONFIG_MMCSD_SPI)
 int sam_sdinitialize(int minor);
 #endif

-/************************************************************************************
+/****************************************************************************
 * Name: sam_tsc_setup
 *
 * Description:
- *   This function is called by board-bringup logic to configure the touchscreen
- *   device.  This function will register the driver as /dev/inputN where N is the
+ *   This function is called by board-bringup logic to configure the
+ *   touchscreen device.
+ *   This function will register the driver as /dev/inputN where N is the
 *   minor device number.
 *
 * Input Parameters:
 *   minor   - The input device minor number
 *
 * Returned Value:
- *   Zero is returned on success.  Otherwise, a negated errno value is returned to
- *   indicate the nature of the failure.
+ *   Zero is returned on success.
+ *   Otherwise, a negated errno value is returned to indicate the nature
+ *   of the failure.
 *
- ************************************************************************************/
+ ****************************************************************************/

 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
    defined(CONFIG_INPUT_ADS7843E)
@@ -360,5 +363,4 @@ int sam_tsc_setup(int minor);
 #endif

 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_ARDUINO_DUE_SRC_ARDUNO_DUE_H */
-
+#endif /* __BOARDS_ARM_SAM34_ARDUINO_DUE_SRC_ARDUNO_DUE_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/arduino-due/src/sam_appinit.c
+ * boards/arm/sam34/arduino-due/src/sam_appinit.c
 *
 *   Copyright (C) 2013, 2016, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arduino-due/src/sam_autoleds.c
+ * boards/arm/sam34/arduino-due/src/sam_autoleds.c
 *
 *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arduino-due/src/sam_boot.c
+ * boards/arm/sam34/arduino-due/src/sam_boot.c
 *
 *   Copyright (C) 2013, 2015, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/arduino-due/src/sam_bringup.c
+ * boards/arm/sam34/arduino-due/src/sam_bringup.c
 *
 *   Copyright (C) 2013, 2016, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +53,9 @@

 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
    defined(CONFIG_MMCSD_SPI)
+
 /* Support for the SD card slot on the ITEAD TFT shield */
+
 /* Verify NSH PORT and SLOT settings */

 #  define SAM34_MMCSDSLOTNO    0 /* There is only one slot */
@@ -92,30 +94,30 @@ int sam_bringup(void)
  int ret;

 #ifdef CONFIG_FS_PROCFS
+
  /* Mount the procfs file system */

  ret = mount(NULL, "/proc", "procfs", 0, NULL);
  if (ret < 0)
    {
-      syslog(LOG_ERR,"ERROR: Failed to mount procfs at /proc: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to mount procfs at /proc: %d\n",
            ret);
    }
 #endif

 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
    defined(CONFIG_MMCSD_SPI)
+
  /* Initialize the SPI-based MMC/SD slot */

-  {
-    int ret = sam_sdinitialize(CONFIG_NSH_MMCSDMINOR);
-    if (ret < 0)
-      {
-        syslog(LOG_ERR,
-               "board_app_initialize: Failed to initialize MMC/SD slot: %d\n",
-               ret);
-       return ret;
-      }
-  }
+  int ret = sam_sdinitialize(CONFIG_NSH_MMCSDMINOR);
+  if (ret < 0)
+    {
+      syslog(LOG_ERR,
+             "board_app_initialize: Failed to initialize MMC/SD slot: %d\n",
+             ret);
+      return ret;
+    }
 #endif

 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/src/up_mmcsd.c
+ * boards/arm/sam34/arduino-due/src/up_mmcsd.c
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,8 +53,8 @@

 #include "arduino-due.h"

-/* In order to use the SD card on the ITEAD shield, you must enable the SPI bit-bang
- * driver as well as support for SPI-based MMC/SD cards.
+/* In order to use the SD card on the ITEAD shield, you must enable the SPI
+ * bit-bang driver as well as support for SPI-based MMC/SD cards.
 */

 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
@@ -63,6 +63,7 @@
 /****************************************************************************
 * Pre-processor Definitions
 ****************************************************************************/
+
 /* Configuration ************************************************************/

 #ifdef CONFIG_DISABLE_MOUNTPOINT
@@ -120,6 +121,7 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid,
 /****************************************************************************
 * Private Functions
 ****************************************************************************/
+
 /****************************************************************************
 * Include the bit-band skeleton logic
 ****************************************************************************/
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/up_touchscreen.c
+/****************************************************************************
+ * boards/arm/sam34/arduino-due/src/up_touchscreen.c
 *
 *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,7 +31,7 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

 /****************************************************************************
 * Included Files
@@ -68,6 +68,7 @@
 /****************************************************************************
 * Pre-processor Definitions
 ****************************************************************************/
+
 /* Configuration ************************************************************/

 #ifndef CONFIG_SAM34_GPIOC_IRQ
@@ -119,6 +120,7 @@
 /****************************************************************************
 * Private Function Prototypes
 ****************************************************************************/
+
 /* Lower-half SPI */

 static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid,
@@ -383,7 +385,9 @@ int sam_tsc_setup(int minor)
  if (ret < 0)
    {
      ierr("ERROR: Failed to register touchscreen device\n");
+
      /* up_spiuninitialize(dev); */
+
      return -ENODEV;
    }

@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arduino-due/src/sam_userleds.c
+ * boards/arm/sam34/arduino-due/src/sam_userleds.c
 *
 *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/flipnclick-sam3x/include/board.h
+/****************************************************************************
+ * boards/arm/sam34/flipnclick-sam3x/include/board.h
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H
-#define __BOARDS_ARM_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_SAM34_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H
+#define __BOARDS_ARM_SAM34_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -50,18 +50,19 @@
 #  endif
 #endif

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/* Clocking *************************************************************************/
-/* After power-on reset, the SAM3X device is running on a 4MHz internal RC.  These
- * definitions will configure clocking
+/* Clocking *****************************************************************/
+
+/* After power-on reset, the SAM3X device is running on a 4MHz internal RC.
+ *  These definitions will configure clocking
 *
- *   MAINOSC:  Frequency = 12MHz (crystal)
- *   PLLA: PLL Divider = 1, Multiplier = 14 to generate PLLACK = 168MHz
- *   Master Clock (MCK): Source = PLLACK, Prescalar = 1 to generate MCK = 84MHz
- *   CPU clock: 84MHz
+ * MAINOSC:  Frequency = 12MHz (crystal)
+ * PLLA: PLL Divider = 1, Multiplier = 14 to generate PLLACK = 168MHz
+ * Master Clock (MCK): Source = PLLACK, Prescalar = 1 to generate MCK = 84MHz
+ * CPU clock: 84MHz
 */

 #define BOARD_32KOSC_FREQUENCY     (32768)
@@ -143,7 +144,8 @@

 #define BOARD_FWS                  4

-/* LED definitions ******************************************************************/
+/* LED definitions **********************************************************/
+
 /* There are four LEDs on the top, blue side of the board.  Only one can be
 * controlled by software:
 *
@@ -194,13 +196,16 @@
 #endif

 /* These LEDs are available to the application and are all available to the
- * application unless CONFIG_ARCH_LEDS is defined.  In that case, the usage by the
- * board port is defined in include/board.h and src/sam_autoleds.c.  The LEDs are
- * used to encode OS-related events as follows:
+ * application unless CONFIG_ARCH_LEDS is defined.
+ * In that case, the usage by the board port is defined in include/board.h
+ * and src/sam_autoleds.c.
+ * The LEDs are used to encode OS-related events as follows:
 *
 *      SYMBOL                MEANING                        LED STATE
 *                                                     L   A   B   C   D
- *      ----------------      ----------------------- --- --- --- --- ---*/
+ *      ----------------      ----------------------- --- --- --- --- ---
+ */
+
 #define LED_STARTED      0 /* NuttX has been started  OFF ON  OFF OFF OFF */
 #define LED_HEAPALLOCATE 1 /* Heap has been allocated OFF OFF ON  OFF OFF */
 #define LED_IRQSENABLED  2 /* Interrupts enabled      OFF OFF OFF ON  OFF */
@@ -211,46 +216,53 @@
 #define LED_PANIC        4 /* The system has crashed  2Hz N/C N/C N/C N/C */
 #undef  LED_IDLE           /* MCU is is sleep mode    ---- Not used ----- */

-/* Thus if LED L is faintly glowing and all other LEDs are off (except LED D which
- * was left on but is no longer controlled by NuttX and so may be in any state),
- * NuttX has successfully booted and is, apparently, running normally and taking
- * interrupts.  If any of LEDs A-D are statically set, then NuttX failed to boot
- * and the LED indicates the initialization phase where the failure occurred.  If
- * LED L is flashing at approximately 2Hz, then a fatal error has been detected and
- * the system has halted.
+/* Thus if LED L is faintly glowing and all other LEDs are off
+ * (except LED D which was left on but is no longer controlled by NuttX and
+ * so may be in any state),
+ * NuttX has successfully booted and is, apparently, running normally and
+ * taking interrupts.
+ * If any of LEDs A-D are statically set, then NuttX failed to boot and the
+ * LED indicates the initialization phase where the failure occurred.
+ * If LED L is flashing at approximately 2Hz, then a fatal error has been
+ * detected and the system has halted.
 *
 * NOTE: After booting, LEDs A-D are no longer used by the system and may be
 * controlled the application.
 */

-/* Button definitions ***************************************************************/
+/* Button definitions *******************************************************/
+
 /*   There are no buttons on the Arduino Due board. */

-/* GPIO pin configurations **********************************************************/
+/* GPIO pin configurations **************************************************/
+
 /* Universal Asynchronous Receiver Transceiver (UART)
 *
 *   The SAM3X has a UART and 4 USARTS.  The Programming port uses a USB-to-
- *   serial chip connected to the first of the MCU (RX0 and TX0 on PA8 and PA9,
- *   respectively).  The output from that port is visible using the Arduino tool.
+ *   serial chip connected to the first of the MCU (RX0 and TX0 on PA8 and
+ *   PA9, respectively).
+ *   The output from that port is visible using the Arduino tool.
 *
- *   Any of UART and USART0-3 may be used as a serial console.  By default,
- *   UART0 is used as the serial console in all configurations.
+ *   Any of UART and USART0-3 may be used as a serial console.
+ *   By default, UART0 is used as the serial console in all configurations.
 *
 * There are no alternatives for these pins.
 */

 /* Universal Synchronous Asynchronous Receiver Transmitter (USART)
 *
- *   The RX and TX pins are available on the Arduino connector D0 and D1 pins,
- *   respectively.  These are connected to USART0, RXD0 and TXD0 which are PA10
- *   and PA11, respectively.
+ *   The RX and TX pins are available on the Arduino connector D0 and D1
+ *   pins, respectively.
+ *   These are connected to USART0, RXD0 and TXD0 which are PA10 and PA11,
+ *   respectively.
 *
- *   There are four Click bus connectors with serial ports available as follows:
+ *   There are four Click bus connectors with serial ports available as
+ *   follows:
 *
- *      Click A:  USART0 RXD0 and TXD0 which are, again, PA10 and PA11.
- *      Click B:  USART1 RXD1 and TXD1 which are PA12 and PA13, respectively.
- *      Click C:  USART3 RXD3 and TXD3 which are PD5 and PD4, respectively.
- *      Click D:  USART3 RXD3 and TXD3 which are, again, PD5 and PD4.
+ *   Click A:  USART0 RXD0 and TXD0 which are, again, PA10 and PA11.
+ *   Click B:  USART1 RXD1 and TXD1 which are PA12 and PA13, respectively.
+ *   Click C:  USART3 RXD3 and TXD3 which are PD5 and PD4, respectively.
+ *   Click D:  USART3 RXD3 and TXD3 which are, again, PD5 and PD4.
 *
 * There are no alternatives for these pins.
 */
@@ -288,7 +300,7 @@
 *   MOSI SPI0_MOSI    PA26   MOSI SPI0_MOSI    PA26
 *
 * Chip select pin definitions are provided in
- * boards/flipnclick-sam3x/src/flipnclick-3x.h.
+ * boards/arm/sam34/flipnclick-sam3x/src/flipnclick-3x.h.
 *
 * There are no alternative pin selections for SPI0_MISO and SPIO_MOSI.
 */
@@ -324,4 +336,4 @@
 * There are no alternative pin selections for TWI0 and TWI1.
 */

-#endif  /* __BOARDS_ARM_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H */
+#endif  /* __BOARDS_ARM_SAM34_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H */
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/flipnclick-sam3x/scripts/Make.defs
+# boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs
 #
 #   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/flipnclick-sam3x/scripts/flash.ld
+ * boards/arm/sam34/flipnclick-sam3x/scripts/flash.ld
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/flipnclick-sam3x/src/Makefile
+# boards/arm/sam34/flipnclick-sam3x/src/Makefile
 #
 #   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/flipnclick-sam3x/src/flipnclick-sam3x.h
+/****************************************************************************
+ * boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H
-#define __BOARDS_ARM_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H
+#ifndef __BOARDS_ARM_SAM34_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H
+#define __BOARDS_ARM_SAM34_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
@@ -50,9 +50,10 @@

 #include "hardware/sam_pinmap.h"

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/
+
 /* Configuration ************************************************************/

 #define HAVE_SSD1306 1
@@ -230,19 +231,19 @@
                            GPIO_PORT_PIOD | GPIO_PIN6)
 #endif

-/************************************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public data
- ************************************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

 /****************************************************************************
 * Name: sam_bringup
@@ -276,5 +277,4 @@ FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno);
 #endif

 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H */
-
+#endif /* __BOARDS_ARM_SAM34_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/flipnclick-sam3x/src/sam_appinit.c
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_appinit.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -83,10 +83,12 @@
 int board_app_initialize(uintptr_t arg)
 {
 #ifdef CONFIG_BOARD_LATE_INITIALIZE
+
  /* Board initialization already performed by board_late_initialize() */

  return OK;
 #else
+
  /* Perform board-specific initialization */

  return sam_bringup();
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/flipnclick-sam3x/src/sam_autoleds.c
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_autoleds.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -32,8 +32,9 @@
 * POSSIBILITY OF SUCH DAMAGE.
 *
 ****************************************************************************/
-/* There are four LEDs on the top, blue side of the board.  Only one can be
- * controlled by software:
+
+/* There are four LEDs on the top, blue side of the board.
+ *  Only one can be controlled by software:
 *
 *   LED L - PB27 (PWM13)
 *
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/flipnclick-sam3x/src/sam_boot.c
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_boot.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -63,6 +63,7 @@
 void sam_boardinitialize(void)
 {
 #ifdef CONFIG_ARCH_LEDS
+
  /* Configure on-board LEDs if LED support has been selected. */

  board_autoled_initialize();
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/flipnclick-sam3x/src/sam_bringup.c
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -79,17 +79,18 @@ int sam_bringup(void)
  ret = mount(NULL, "/proc", "procfs", 0, NULL);
  if (ret < 0)
    {
-      syslog(LOG_ERR,"ERROR: Failed to mount procfs at /proc: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to mount procfs at /proc: %d\n",
            ret);
    }
 #endif

 #if defined(HAVE_SSD1306) && !defined(CONFIG_NXSTART_EXTERNINIT)
+
  /* Configure the SSD1306 OLED */

  if (sam_graphics_setup(0) == NULL)
    {
-      syslog(LOG_ERR,"ERROR: Failed to configure the SSD1306 OLED\n");
+      syslog(LOG_ERR, "ERROR: Failed to configure the SSD1306 OLED\n");
    }
 #endif

@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/flipnclick-sam3x/src/sam_spi0.c
+/****************************************************************************
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -56,17 +56,17 @@

 #ifdef CONFIG_SAM34_SPI0

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_spidev_initialize
 *
 * Description:
 *   Called to configure SPI chip select GPIO pins for the SAM4E-EK board.
 *
- ************************************************************************************/
+ ****************************************************************************/

 void weak_function sam_spidev_initialize(void)
 {
@@ -82,8 +82,8 @@ void weak_function sam_spidev_initialize(void)
 * Name:  sam_spi0select, sam_spi0status, and sam_spic0mddata
 *
 * Description:
- *   These external functions must be provided by board-specific logic.  They
- *   include:
+ *   These external functions must be provided by board-specific logic.
+ *   They include:
 *
 *   o sam_spi0select is a functions tomanage the board-specific chip selects
 *   o sam_spi0status and sam_spic0mddata:  Implementations of the status
@@ -95,17 +95,17 @@ void weak_function sam_spidev_initialize(void)
 *
 *   1. Provide logic in sam_boardinitialize() to configure SPI chip select
 *      pins.
- *   2. Provide sam_spi0select() and sam_spi0status() functions in your board-
- *      specific logic.  These functions will perform chip selection and
- *      status operations using GPIOs in the way your board is configured.
+ *   2. Provide sam_spi0select() and sam_spi0status() functions in your
+ *      board- specific logic.  These functions will perform chip selection
+ *      and status operations using GPIOs in the way your board is configured.
 *   2. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
 *      sam_spic0mddata() functions in your board-specific logic.  This
 *      function will perform cmd/data selection operations using GPIOs in
 *      the way your board is configured.
 *   3. Add a call to sam_spibus_initialize() in your low level application
 *      initialization logic
- *   4. The handle returned by sam_spibus_initialize() may then be used to bind the
- *      SPI driver to higher level logic (e.g., calling
+ *   4. The handle returned by sam_spibus_initialize() may then be used to
+ *      bind the SPI driver to higher level logic (e.g., calling
 *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
 *      the SPI MMC/SD driver).
 *
@@ -213,8 +213,6 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
 #endif

  return 0;
-
 }
 #endif
-
 #endif /* CONFIG_SAM34_SPI0 */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/flipnclick-sam3x/src/sam_ssd1306.c
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,9 +35,10 @@

 /* SSD1306 OLED
 *
- * The HiletGo is a 128x64 OLED that can be driven either via SPI or I2C (SPI
- * is the default and is what is used here).  I have mounted the OLED on a
- * proto click board.  The OLED is connected as follows:
+ * The HiletGo is a 128x64 OLED that can be driven either via SPI or I2C
+ * (SPI is the default and is what is used here).
+ * I have mounted the OLED on a proto click board.
+ * The OLED is connected as follows:
 *
 * OLED  ALIAS       DESCRIPTION   PROTO CLICK
 * ----- ----------- ------------- -----------------
@@ -77,6 +78,7 @@
 /****************************************************************************
 * Pre-processor Definitions
 ****************************************************************************/
+
 /* Configuration ************************************************************/

 #ifndef CONFIG_SPI_CMDDATA
@@ -138,6 +140,7 @@ FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno)
          (void)dev->setpower(dev, CONFIG_LCD_MAXPOWER);

 #if defined(CONFIG_VIDEO_FB) && defined(CONFIG_LCD_FRAMEBUFFER)
+
          /* Initialize and register the simulated framebuffer driver */

          ret = fb_register(0, 0);
@@ -168,5 +171,4 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
  return sam_graphics_setup(devno);
 }
 #endif
-
 #endif /* HAVE_SSD1306 */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/flipnclick-sam3x/src/sam_userleds.c
+ * boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -32,6 +32,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 *
 ****************************************************************************/
+
 /* There are four LEDs on the top, blue side of the board.  Only one can be
 * controlled by software:
 *
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/include/board.h
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/include/board.h
 *
 *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __ARCH_SAM3U_EK_INCLUDE_BOARD_H
-#define __ARCH_SAM3U_EK_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_SAM34_SAM3U_EK_INCLUDE_BOARD_H
+#define __BOARDS_ARM_SAM34_SAM3U_EK_INCLUDE_BOARD_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -49,13 +49,14 @@
 #  endif
 #endif

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/* Clocking *************************************************************************/
-/* After power-on reset, the sam3u device is running on a 4MHz internal RC.  These
- * definitions will configure clocking
+/* Clocking *****************************************************************/
+
+/* After power-on reset, the sam3u device is running on a 4MHz internal RC.
+ * These definitions will configure clocking
 *
 *   MAINOSC:  Frequency = 12MHz (crysta)
 *   PLLA: PLL Divider = 1, Multiplier = 16 to generate PLLACK = 192MHz
@@ -139,7 +140,7 @@

 #define BOARD_FWS                  3

-/* LED definitions ******************************************************************/
+/* LED definitions **********************************************************/

 #define LED_STARTED                0 /* LED0=OFF LED1=OFF LED2=OFF */
 #define LED_HEAPALLOCATE           1 /* LED0=OFF LED1=OFF LED2=ON */
@@ -151,9 +152,9 @@
 #define LED_ASSERTION              6 /* LED0=TOG LED1=XXX LED2=XXX */
 #define LED_PANIC                  7 /* LED0=TOG LED1=XXX LED2=XXX */

-/* Button definitions ***************************************************************/
+/* Button definitions *******************************************************/

 #define BUTTON1                    1 /* Bit 0: Button 1 */
 #define BUTTON2                    2 /* Bit 1: Button 2 */

-#endif  /* __ARCH_SAM3U_EK_INCLUDE_BOARD_H */
+#endif  /* __BOARDS_ARM_SAM34_SAM3U_EK_INCLUDE_BOARD_H */
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sam3u-ek/kernel/Makefile
+# boards/arm/sam34/sam3u-ek/kernel/Makefile
 #
 #   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/kernel/sam_userspace.c
+ * boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
 *
 *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,6 +50,7 @@
 /****************************************************************************
 * Pre-processor Definitions
 ****************************************************************************/
+
 /* Configuration ************************************************************/

 #ifndef CONFIG_NUTTX_USERSPACE
@@ -64,9 +65,9 @@
 * Public Data
 ****************************************************************************/

-/* These 'addresses' of these values are setup by the linker script.  They are
- * not actual uint32_t storage locations! They are only used meaningfully in the
- * following way:
+/* These 'addresses' of these values are setup by the linker script.
+ * They are not actual uint32_t storage locations!
+ * They are only used meaningfully in the following way:
 *
 *  - The linker script defines, for example, the symbol_sdata.
 *  - The declareion extern uint32_t _sdata; makes C happy.  C will believe
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sam3u-ek/scripts/Make.defs
+# boards/arm/sam34/sam3u-ek/scripts/Make.defs
 #
 #   Copyright (C) 2010, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/scripts/kernel-space.ld
+ * boards/arm/sam34/sam3u-ek/scripts/kernel-space.ld
 *
 *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/scripts/ld.script
+ * boards/arm/sam34/sam3u-ek/scripts/ld.script
 *
 *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/scripts/user-space.ld
+ * boards/arm/sam34/sam3u-ek/scripts/user-space.ld
 *
 *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/scripts/user-space.ld
+ * boards/arm/sam34/sam3u-ek/scripts/user-space.ld
 *
 *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sam3u-ek/src/Makefile
+# boards/arm/sam34/sam3u-ek/src/Makefile
 #
 #   Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/sam3u-ek.h
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/src/sam3u-ek.h
 *
 *   Copyright (C) 2009-2011, 2013, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_SAM3U_EK_SRC_SAM3U_EK_H
-#define __BOARDS_ARM_SAM3U_EK_SRC_SAM3U_EK_H
+#ifndef __BOARDS_ARM_SAM34_SAM3U_EK_SRC_SAM3U_EK_H
+#define __BOARDS_ARM_SAM34_SAM3U_EK_SRC_SAM3U_EK_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
@@ -50,11 +50,12 @@

 #include "hardware/sam_pinmap.h"

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/
+
+/* External Memory Usage ****************************************************/

-/* External Memory Usage ************************************************************/
 /* LCD on CS2 */

 #define LCD_BASE              SAM_EXTCS2_BASE
@@ -64,7 +65,7 @@
 #define CONFIG_TSC_ADS7843    1   /* ADS7843 present on board */
 #define CONFIG_TSC_SPI        0   /* On SPI0 */

-/* SAM3U-EK GPIO Pin Definitions ****************************************************/
+/* SAM3U-EK GPIO Pin Definitions ********************************************/

 /* LCD:
 *   LCD Module Pin Out:                         SAM3U PIO:
@@ -144,8 +145,8 @@
 * The IRQ is active low and pulled up.
 *
 * Pen Interrupt. Open anode output, requires 10kO to 100kO pull-up resistor
- * externally.  There is a 100KO pull-up on the SAM3U-EK board so no additional
- * pull-up should be required.
+ * externally.  There is a 100KO pull-up on the SAM3U-EK board so no
+ * additional pull-up should be required.
 *
 * BUSY is high impedance when CS is high (not selected).  When CS is
 * is low, BUSY is active high.  Since the pin is pulled up, it will appear
@@ -184,50 +185,53 @@

 /* SPI Chip Selects */

-/* Chip select pin connected to the touchscreen controller and to the ZigBee module
- * connector.  Notice that the touchscreen chip select is implemented as a GPIO
- * OUTPUT that must be controlled by board-specific.  This is because the ADS7843E
- * driver must be able to sample the device BUSY GPIO input between SPI transfers.
- * However, the AD7843E will tri-state the BUSY input whenever the chip select is
- * de-asserted.  So the only option is to control the chip select manually and hold
- * it low throughout the SPI transfer.
+/* Chip select pin connected to the touchscreen controller and to the ZigBee
+ * module connector.
+ * Notice that the touchscreen chip select is implemented as a GPIO OUTPUT
+ * that must be controlled by board-specific.
+ * This is because the ADS7843E driver must be able to sample the device BUSY
+ * GPIO input between SPI transfers.
+ * However, the AD7843E will tri-state the BUSY input whenever the chip
+ * select is de-asserted.
+ * So the only option is to control the chip select manually and hold it low
+ * throughout the SPI transfer.
 */

 #define GPIO_TSC_NPCS2 (GPIO_OUTPUT | GPIO_CFG_PULLUP | GPIO_OUTPUT_SET | \
                        GPIO_PORT_PIOC | GPIO_PIN14)
 #define TSC_CSNUM      2

-/************************************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public data
- ************************************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_spidev_initialize
 *
 * Description:
 *   Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
 *
- ************************************************************************************/
+ ****************************************************************************/

 void weak_function sam_spidev_initialize(void);

-/************************************************************************************
+/****************************************************************************
 * Name: sam_hsmciinit
 *
 * Description:
 *   Initialize HSMCI support
 *
- ************************************************************************************/
+ ****************************************************************************/

 #ifdef CONFIG_SAM34_HSMCI
 int weak_function sam_hsmciinit(void);
@@ -235,13 +239,13 @@ int weak_function sam_hsmciinit(void);
 # define sam_hsmciinit()
 #endif

-/************************************************************************************
+/****************************************************************************
 * Name: sam_cardinserted
 *
 * Description:
 *   Check if a card is inserted into the selected HSMCI slot
 *
- ************************************************************************************/
+ ****************************************************************************/

 #ifdef CONFIG_SAM34_HSMCI
 bool sam_cardinserted(unsigned char slot);
@@ -249,13 +253,13 @@ bool sam_cardinserted(unsigned char slot);
 #  define sam_cardinserted(slot) (false)
 #endif

-/************************************************************************************
+/****************************************************************************
 * Name: sam_writeprotected
 *
 * Description:
 *   Check if a card is inserted into the selected HSMCI slot
 *
- ************************************************************************************/
+ ****************************************************************************/

 #ifdef CONFIG_SAM34_HSMCI
 bool sam_writeprotected(unsigned char slot);
@@ -263,26 +267,28 @@ bool sam_writeprotected(unsigned char slot);
 #  define sam_writeprotected(slot) (false)
 #endif

-/************************************************************************************
+/****************************************************************************
 * Name: sam_tsc_setup
 *
 * Description:
- *   This function is called by board-bringup logic to configure the touchscreen
- *   device.  This function will register the driver as /dev/inputN where N is the
+ *   This function is called by board-bringup logic to configure the
+ *   touchscreen device.
+ *   This function will register the driver as /dev/inputN where N is the
 *   minor device number.
 *
 * Input Parameters:
 *   minor   - The input device minor number
 *
 * Returned Value:
- *   Zero is returned on success.  Otherwise, a negated errno value is returned to
- *   indicate the nature of the failure.
+ *   Zero is returned on success.
+ *   Otherwise, a negated errno value is returned to indicate the nature
+ *   of the failure.
 *
- ***********************************************************************************/
+ ****************************************************************************/

 #ifdef CONFIG_INPUT_ADS7843E
 int sam_tsc_setup(int minor);
 #endif

 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_SAM3U_EK_SRC_SAM3U_EK_H */
+#endif /* __BOARDS_ARM_SAM34_SAM3U_EK_SRC_SAM3U_EK_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sam3u-ek/src/sam_appinit.c
+ * boards/arm/sam34/sam3u-ek/src/sam_appinit.c
 *
 *   Copyright (C) 2010, 2013, 2016, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -68,8 +68,8 @@
 #  undef NSH_HAVE_MMCSD
 #endif

-/* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
- * is not enabled.
+/* Can't support MMC/SD features if mountpoints are disabled or if SDIO
+ * support is not enabled.
 */

 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM34_HSMCI)
@@ -134,6 +134,7 @@ int board_app_initialize(uintptr_t arg)
  FAR struct sdio_dev_s *sdio;

  /* Mount the SDIO-based MMC/SD block driver */
+
  /* First, get an instance of the SDIO interface */

  syslog(LOG_INFO, "Initializing SDIO slot %d\n",
@@ -155,7 +156,8 @@ int board_app_initialize(uintptr_t arg)
  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
  if (ret != OK)
    {
-      syslog(LOG_ERR, "ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      syslog(LOG_ERR,
+             "ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
      return ret;
    }

@@ -163,7 +165,7 @@ int board_app_initialize(uintptr_t arg)

  /* Then inform the HSMCI driver if there is or is not a card in the slot. */

-   sdio_mediachange(sdio, sam_cardinserted(0));
+  sdio_mediachange(sdio, sam_cardinserted(0));
 #endif

 #ifdef CONFIG_INPUT
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/sam_boot.c
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/src/sam_boot.c
 *
 *   Copyright (C) 2009-2011, 2013, 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -47,32 +47,33 @@
 #include "up_arch.h"
 #include "sam3u-ek.h"

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_boardinitialize
 *
 * Description:
- *   All SAM3U architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
+ *   All SAM3U architectures must provide the following entry point.
+ *   This entry point is called early in the intitialization -- after all
+ *   memory has been configured and mapped but before any devices have been
+ *   initialized.
 *
- ************************************************************************************/
+ ****************************************************************************/

 void sam_boardinitialize(void)
 {
-  /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spidev_initialize() has been brought into the link.
+  /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak
+   * function sam_spidev_initialize() has been brought into the link.
   */

 #ifdef CONFIG_SAM34_SPI0
@@ -90,7 +91,7 @@ void sam_boardinitialize(void)

  /* Setup SD card-related PIOs if 1) HSMCI is selected and 2) the weak
   * function sam_hsmciinit() has been brought into the build.
-    */
+   */

 #ifdef CONFIG_SAM34_HSMCI
  if (sam_hsmciinit)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/src/up_leds.c
+ * boards/arm/sam34/sam3u-ek/src/up_leds.c
 *
 *   Copyright (C) 2010, 2014-2015, 2017 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -109,10 +109,10 @@ static int board_button_irqx(gpio_pinset_t pinset, int irq, xcpt_t irqhandler,
 * Name: board_button_initialize
 *
 * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
 *
 ****************************************************************************/

@@ -122,16 +122,17 @@ void board_button_initialize(void)
  (void)sam_configgpio(GPIO_BUTTON2);
 }

-/************************************************************************************
+/****************************************************************************
 * Name: board_buttons
 *
 * Description:
- *   After board_button_initialize() has been called, board_buttons() may be called to collect
- *   the state of all buttons.  board_buttons() returns an 32-bit bit set with each bit
- *   associated with a button.  See the BUTTON* definitions above for the meaning of
- *   each bit in the returned value.
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.
+ *   board_buttons() returns an 32-bit bit set with each bit associated with
+ *   a button.  See the BUTTON* definitions above for the meaning of each bit
+ *   in the returned value.
 *
- ************************************************************************************/
+ ****************************************************************************/

 uint32_t board_buttons(void)
 {
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/src/sam_leds.c
+ * boards/arm/sam34/sam3u-ek/src/sam_leds.c
 *
 *   Copyright (C) 2009-2010, 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -82,28 +82,28 @@

 static const uint8_t g_ledon[8] =
 {
-  (LED0_OFF     |LED1_OFF     |LED2_OFF),      /* LED_STARTED  */
-  (LED0_ON      |LED1_OFF     |LED2_ON),       /* LED_HEAPALLOCATE */
-  (LED0_OFF     |LED1_ON      |LED2_OFF),      /* LED_IRQSENABLED  */
-  (LED0_ON      |LED1_ON      |LED2_ON),       /* LED_STACKCREATED  */
+  (LED0_OFF     | LED1_OFF     | LED2_OFF),      /* LED_STARTED  */
+  (LED0_ON      | LED1_OFF     | LED2_ON),       /* LED_HEAPALLOCATE */
+  (LED0_OFF     | LED1_ON      | LED2_OFF),      /* LED_IRQSENABLED  */
+  (LED0_ON      | LED1_ON      | LED2_ON),       /* LED_STACKCREATED  */

-  (LED0_NOCHANGE|LED1_OFF     |LED2_NOCHANGE), /* LED_INIRQ  */
-  (LED0_NOCHANGE|LED1_NOCHANGE|LED2_OFF),      /* LED_SIGNAL  */
-  (LED0_ON      |LED1_NOCHANGE|LED2_NOCHANGE), /* LED_ASSERTION  */
-  (LED0_ON      |LED1_NOCHANGE|LED2_NOCHANGE)  /* LED_PANIC */
+  (LED0_NOCHANGE | LED1_OFF      | LED2_NOCHANGE), /* LED_INIRQ  */
+  (LED0_NOCHANGE | LED1_NOCHANGE | LED2_OFF),      /* LED_SIGNAL  */
+  (LED0_ON       | LED1_NOCHANGE | LED2_NOCHANGE), /* LED_ASSERTION  */
+  (LED0_ON       | LED1_NOCHANGE | LED2_NOCHANGE)  /* LED_PANIC */
 };

 static const uint8_t g_ledoff[8] =
 {
-  (LED0_OFF     |LED1_OFF     |LED2_OFF),      /* LED_STARTED (does not happen) */
-  (LED0_ON      |LED1_OFF     |LED2_ON),       /* LED_HEAPALLOCATE (does not happen) */
-  (LED0_OFF     |LED1_ON      |LED2_OFF),      /* LED_IRQSENABLED (does not happen) */
-  (LED0_ON      |LED1_ON      |LED2_ON),       /* LED_STACKCREATED (does not happen) */
+  (LED0_OFF     | LED1_OFF     | LED2_OFF),      /* LED_STARTED (does not happen) */
+  (LED0_ON      | LED1_OFF     | LED2_ON),       /* LED_HEAPALLOCATE (does not happen) */
+  (LED0_OFF     | LED1_ON      | LED2_OFF),      /* LED_IRQSENABLED (does not happen) */
+  (LED0_ON      | LED1_ON      | LED2_ON),       /* LED_STACKCREATED (does not happen) */

-  (LED0_NOCHANGE|LED1_ON      |LED2_NOCHANGE), /* LED_INIRQ  */
-  (LED0_NOCHANGE|LED1_NOCHANGE|LED2_ON),       /* LED_SIGNAL */
-  (LED0_OFF     |LED1_NOCHANGE|LED2_NOCHANGE), /* LED_ASSERTION */
-  (LED0_OFF     |LED1_NOCHANGE|LED2_NOCHANGE)  /* LED_PANIC */
+  (LED0_NOCHANGE | LED1_ON       | LED2_NOCHANGE), /* LED_INIRQ  */
+  (LED0_NOCHANGE | LED1_NOCHANGE | LED2_ON),       /* LED_SIGNAL */
+  (LED0_OFF      | LED1_NOCHANGE | LED2_NOCHANGE), /* LED_ASSERTION */
+  (LED0_OFF      | LED1_NOCHANGE | LED2_NOCHANGE)  /* LED_PANIC */
 };

 /****************************************************************************
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/sam_mmcsd.c
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/src/sam_mmcsd.c
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -47,17 +47,19 @@

 #ifdef CONFIG_SAM34_HSMCI

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/* This needs to be extended.  The card detect GPIO must be configured as an interrupt.
- * when the interrupt indicating that a card has been inserted or removed is received,
- * this function must call sio_mediachange() to handle that event.  See
- * arch/arm/src/sam34/sam_hsmci.h for more information.
+/* This needs to be extended.
+ * The card detect GPIO must be configured as an interrupt.
+ * when the interrupt indicating that a card has been inserted or removed
+ * is received, this function must call sio_mediachange() to handle that
+ * event.
+ * See arch/arm/src/sam34/sam_hsmci.h for more information.
 *
- * Also see the SAMA5D3x-EK implementation of this same logic.  The card detect
- * interrupt handling should be a drop-in.
+ * Also see the SAMA5D3x-EK implementation of this same logic.
+ * The card detect interrupt handling should be a drop-in.
 */

 #ifdef GPIO_MCI_CD
@@ -70,22 +72,22 @@
 #  define OK 0
 #endif

-/************************************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_hsmciinit
 *
 * Description:
 *   Initialize HSMCI support.  This function is called very early in board
 *   initialization.
 *
- ************************************************************************************/
+ ****************************************************************************/

 int sam_hsmciinit(void)
 {
@@ -98,13 +100,13 @@ int sam_hsmciinit(void)
  return OK;
 }

-/************************************************************************************
+/****************************************************************************
 * Name: sam_cardinserted
 *
 * Description:
 *   Check if a card is inserted into the selected HSMCI slot
 *
- ************************************************************************************/
+ ****************************************************************************/

 bool sam_cardinserted(unsigned char slot)
 {
@@ -121,13 +123,13 @@ bool sam_cardinserted(unsigned char slot)
  return false;
 }

-/************************************************************************************
+/****************************************************************************
 * Name: sam_writeprotected
 *
 * Description:
 *   Check if a card is inserted into the selected HSMCI slot
 *
- ************************************************************************************/
+ ****************************************************************************/

 bool sam_writeprotected(unsigned char slot)
 {
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/sam_spi.c
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/src/sam_spi.c
 *
 *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -55,17 +55,17 @@

 #ifdef CONFIG_SAM34_SPI0

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_spidev_initialize
 *
 * Description:
 *   Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
 *
- ************************************************************************************/
+ ****************************************************************************/

 void weak_function sam_spidev_initialize(void)
 {
@@ -73,10 +73,10 @@ void weak_function sam_spidev_initialize(void)
   * ZigBee support.
   */

-   /* The touchscreen connects using NPCS2 (PC14). */
+  /* The touchscreen connects using NPCS2 (PC14). */

 #if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_ADS7843E)
-   sam_configgpio(GPIO_TSC_NPCS2);
+  sam_configgpio(GPIO_TSC_NPCS2);
 #endif
 }

@@ -84,8 +84,8 @@ void weak_function sam_spidev_initialize(void)
 * Name:  sam_spi0select, sam_spi0status, and sam_spic0mddata
 *
 * Description:
- *   These external functions must be provided by board-specific logic.  They
- *   include:
+ *   These external functions must be provided by board-specific logic.
+ *   They include:
 *
 *   o sam_spi0select is a functions tomanage the board-specific chip selects
 *   o sam_spi0status and sam_spic0mddata:  Implementations of the status
@@ -106,8 +106,8 @@ void weak_function sam_spidev_initialize(void)
 *      the way your board is configured.
 *   3. Add a call to sam_spibus_initialize() in your low level application
 *      initialization logic
- *   4. The handle returned by sam_spibus_initialize() may then be used to bind the
- *      SPI driver to higher level logic (e.g., calling
+ *   4. The handle returned by sam_spibus_initialize() may then be used to
+ *      bind the SPI driver to higher level logic (e.g., calling
 *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
 *      the SPI MMC/SD driver).
 *
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/sam_touchscreen.c
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c
 *
 *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,7 +31,7 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

 /****************************************************************************
 * Included Files
@@ -58,6 +58,7 @@
 /****************************************************************************
 * Pre-processor Definitions
 ****************************************************************************/
+
 /* Configuration ************************************************************/

 #ifdef CONFIG_INPUT_ADS7843E
@@ -264,7 +265,9 @@ int sam_tsc_setup(int minor)
  if (ret < 0)
    {
      ierr("ERROR: Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+
      /* sam_spibus_uninitialize(dev); */
+
      return -ENODEV;
    }

@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam3u-ek/src/sam_usbdev.c
+/****************************************************************************
+ * boards/arm/sam34/sam3u-ek/src/sam_usbdev.c
 *
 *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -31,11 +31,11 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -50,28 +50,29 @@
 #include "up_arch.h"
 #include "sam3u-ek.h"

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Private Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name:  sam_usbsuspend
 *
 * Description:
- *   Board logic must provide the sam_usbsuspend logic if the USBDEV driver is
- *   used.  This function is called whenever the USB enters or leaves suspend mode.
- *   This is an opportunity for the board logic to shutdown clocks, power, etc.
- *   while the USB is suspended.
+ *   Board logic must provide the sam_usbsuspend logic if the USBDEV driver
+ *   is used.
+ *   This function is called whenever the USB enters or leaves suspend mode.
+ *   This is an opportunity for the board logic to shutdown clocks, power,
+ *   etc. while the USB is suspended.
 *
- ************************************************************************************/
+ ****************************************************************************/

 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam3u-ek/src/sam_usbmsc.c
+ * boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c
 *
 *   Copyright (C) 2009, 2013, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -116,13 +116,13 @@ int board_usbmsc_initialize(int port)

  syslog(LOG_INFO, "Successfully bound SDIO to the MMC/SD driver\n");

-  /* Then let's guess and say that there is a card in the slot.  I need to check to
-   * see if the SAM3U10E-EVAL board supports a GPIO to detect if there is a card in
-   * the slot.
+  /* Then let's guess and say that there is a card in the slot.
+   * I need to check to see if the SAM3U10E-EVAL board supports a GPIO
+   * to detect if there is a card in the slot.
   */

-   sdio_mediachange(sdio, true);
-   return OK;
+  sdio_mediachange(sdio, true);
+  return OK;
 }

 #endif /* CONFIG_SAM34_HSMCI */
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam4cmp-db/include/board.h
+/****************************************************************************
+ * boards/arm/sam34/sam4cmp-db/include/board.h
 *
 *   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
 *   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_SAM4CMP_DB_INCLUDE_BOARD_H
-#define __BOARDS_ARM_SAM4CMP_DB_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_SAM34_SAM4CMP_DB_INCLUDE_BOARD_H
+#define __BOARDS_ARM_SAM34_SAM4CMP_DB_INCLUDE_BOARD_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>

@@ -46,13 +46,15 @@
 #  include <stdint.h>
 #endif

-/************************************************************************************
+/****************************************************************************
 * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/

-/* Clocking *************************************************************************/
-/* After power-on reset, the sam3u device is running on a 4MHz internal RC.  These
- * definitions will configure clocking with MCK = 48MHz, PLLA = 96, and CPU=120MHz.
+/* Clocking *****************************************************************/
+
+/* After power-on reset, the sam3u device is running on a 4MHz internal RC.
+ * These definitions will configure clocking with MCK = 48MHz, PLLA = 96,
+ * and CPU=120MHz.
 */

 /* Main oscillator register settings */
@@ -87,7 +89,6 @@
 #define BOARD_CKGR_PLLBR_COUNT     (63 << PMC_CKGR_PLLBR_COUNT_SHIFT)
 #define BOARD_PLLB_FREQUENCY       (92160000)

-
 /* PMC master clock register settings */

 #define BOARD_PMC_MCKR_CSS         PMC_MCKR_CSS_PLLB
@@ -139,4 +140,4 @@

 #define BOARD_FWS                  5

-#endif /* __BOARDS_ARM_SAM4CMP_DB_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_SAM34_SAM4CMP_DB_INCLUDE_BOARD_H */
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sam4cmp-db/scripts/Make.defs
+# boards/arm/sam34/sam4cmp-db/scripts/Make.defs
 #
 #   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
 #   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/sam4cmp-db/scripts/sam4cmp-db.ld
+ * boards/arm/sam34/sam4cmp-db/scripts/sam4cmp-db.ld
 *
 *   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
 *   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sam4cmp-db/src/Makefile
+# boards/arm/sam34/sam4cmp-db/src/Makefile
 #
 #   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
 #   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
@@ -1,5 +1,5 @@
-/************************************************************************************
- * boards/sam4cmp-db/src/sam4cmp-db.h
+/****************************************************************************
+ * boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h
 *
 *   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
 *   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
@@ -31,14 +31,14 @@
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
- ************************************************************************************/
+ ****************************************************************************/

-#ifndef __BOARDS_ARM_SAM4CMP_DB_SRC_SAM4CMP_DB_H
-#define __BOARDS_ARM_SAM4CMP_DB_SRC_SAM4CMP_DB_H
+#ifndef __BOARDS_ARM_SAM34_SAM4CMP_DB_SRC_SAM4CMP_DB_H
+#define __BOARDS_ARM_SAM34_SAM4CMP_DB_SRC_SAM4CMP_DB_H

-/************************************************************************************
+/****************************************************************************
 * Included Files
- ************************************************************************************/
+ ****************************************************************************/

 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
@@ -50,31 +50,31 @@

 #include "hardware/sam_pinmap.h"

-/************************************************************************************
+/****************************************************************************
 * Public Types
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Public data
- ************************************************************************************/
+ ****************************************************************************/

 #ifndef __ASSEMBLY__

-/************************************************************************************
+/****************************************************************************
 * Public Functions
- ************************************************************************************/
+ ****************************************************************************/

-/************************************************************************************
+/****************************************************************************
 * Name: sam_bringup
 *
 * Description:
 *   Bring up board features
 *
- ************************************************************************************/
+ ****************************************************************************/

 #if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int sam_bringup(void);
 #endif

 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_SAM4CMP_DB_SRC_SAM4CMP_DB_H */
+#endif /* __BOARDS_ARM_SAM34_SAM4CMP_DB_SRC_SAM4CMP_DB_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sam4cmp-db/src/sam_appinit.c
+ * boards/arm/sam34/sam4cmp-db/src/sam_appinit.c
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/Show More
+++ b/Show More