diff --git a/configs/cloudctrl/src/stm32_usbmsc.c b/configs/cloudctrl/src/stm32_usbmsc.c
index 797b6c486ae..086432c233b 100644
--- a/configs/cloudctrl/src/stm32_usbmsc.c
+++ b/configs/cloudctrl/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/cloudctrl/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Darcy Gong <darcy.gong@gmail.com>
  *
@@ -46,6 +46,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 
 /****************************************************************************
@@ -62,14 +64,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in board_app_initialize() (see stm32_appinit.c).
diff --git a/configs/ea3131/src/lpc31_usbmsc.c b/configs/ea3131/src/lpc31_usbmsc.c
index b6dd6648fac..f55bdc8e10f 100644
--- a/configs/ea3131/src/lpc31_usbmsc.c
+++ b/configs/ea3131/src/lpc31_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/ea3131/src/lpc31_usbmsc.c
  *
- *   Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -46,6 +46,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/mkfatfs.h>
@@ -77,14 +78,14 @@ static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   uint8_t *pbuffer;
   int ret;
diff --git a/configs/ea3152/src/lpc31_usbmsc.c b/configs/ea3152/src/lpc31_usbmsc.c
index 81c058f1b66..e251d5cbc02 100644
--- a/configs/ea3152/src/lpc31_usbmsc.c
+++ b/configs/ea3152/src/lpc31_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/ea3152/src/lpc31_usbmsc.c
  *
- *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -46,6 +46,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/mkfatfs.h>
@@ -77,14 +78,14 @@ static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   uint8_t *pbuffer;
   int ret;
@@ -92,7 +93,7 @@ int usbmsc_archinitialize(void)
   pbuffer = (uint8_t *)kmm_malloc(BUFFER_SIZE);
   if (!pbuffer)
     {
-      lowsyslog("usbmsc_archinitialize: Failed to allocate ramdisk of size %d\n",
+      lowsyslog("board_usbmsc_initialize: Failed to allocate ramdisk of size %d\n",
                 BUFFER_SIZE);
       return -ENOMEM;
     }
diff --git a/configs/fire-stm32v2/src/stm32_usbmsc.c b/configs/fire-stm32v2/src/stm32_usbmsc.c
index 96157cdf7ef..8944de6917b 100644
--- a/configs/fire-stm32v2/src/stm32_usbmsc.c
+++ b/configs/fire-stm32v2/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/fire-stm32v2/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the STM32 SPI-based MMC/SD block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 
 /****************************************************************************
@@ -61,14 +63,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see stm32_appinit.c).
diff --git a/configs/hymini-stm32v/src/stm32_usbmsc.c b/configs/hymini-stm32v/src/stm32_usbmsc.c
index 497c54c9db4..9fc826b5b35 100644
--- a/configs/hymini-stm32v/src/stm32_usbmsc.c
+++ b/configs/hymini-stm32v/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/hymini-stm32v/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the STM32 MMC/SD SDIO block driver.
@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -79,14 +80,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see stm32_appinit.c).
diff --git a/configs/kwikstik-k40/src/k40_usbmsc.c b/configs/kwikstik-k40/src/k40_usbmsc.c
index 358712d6190..1272abedec1 100644
--- a/configs/kwikstik-k40/src/k40_usbmsc.c
+++ b/configs/kwikstik-k40/src/k40_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/kwikstik-k40/src/k40_usbmsc.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the Kinetis MMC/SD block driver.
@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -75,14 +76,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see k40_appinit.c).
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c b/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c
index 34ebbd7675e..84d8b65eb53 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c
  *
- *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the LPC17xx MMC/SD SPI block driver.
@@ -45,8 +45,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "lpc17_ssp.h"
 
@@ -77,14 +78,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;
diff --git a/configs/mcu123-lpc214x/src/lpc2148_usbmsc.c b/configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
index 85353342aa4..b8ca9786d49 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2010, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the LPC214x MMC/SD SPI block driver.
@@ -45,8 +45,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "lpc214x_spi.h"
 
@@ -79,14 +80,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;
diff --git a/configs/nucleus2g/src/lpc17_usbmsc.c b/configs/nucleus2g/src/lpc17_usbmsc.c
index 1dcb7c06df7..5c1f1134a55 100644
--- a/configs/nucleus2g/src/lpc17_usbmsc.c
+++ b/configs/nucleus2g/src/lpc17_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/nucleus2g/src/lpc17_usbmsc.c
  *
- *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the LPC17xx MMC/SD SPI block driver.
@@ -45,8 +45,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "lpc17_ssp.h"
 
@@ -77,14 +78,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;
diff --git a/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c b/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c
index f117e4261f9..7fe2266714f 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/olimex-lpc1766stk/src/lpc17_usbmsc.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the LPC17xx MMC/SD SPI block driver.
@@ -45,8 +45,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "lpc17_gpio.h"
 #include "lpc17_ssp.h"
@@ -79,14 +80,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;
diff --git a/configs/olimexino-stm32/src/olimexino-stm32.h b/configs/olimexino-stm32/src/olimexino-stm32.h
index 70e8e8db48a..df496c98943 100644
--- a/configs/olimexino-stm32/src/olimexino-stm32.h
+++ b/configs/olimexino-stm32/src/olimexino-stm32.h
@@ -213,7 +213,7 @@ int stm32_can_initialize(void);
 #endif
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
  *   Called from the application system/usbmc or the boards_nsh if the
@@ -224,8 +224,8 @@ int stm32_can_initialize(void);
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NSH_BUILTIN_APPS) && !defined(CONFIG_SYSTEM_USBMSC)
-int usbmsc_archinitialize(void);
+#ifndef CONFIG_BOARDCTL_USBDEVCTRL
+int board_usbmsc_initialize(int port);
 #endif
 
 #endif /* __ASSEMBLY__ */
diff --git a/configs/olimexino-stm32/src/stm32_appinit.c b/configs/olimexino-stm32/src/stm32_appinit.c
index 9dd3134e553..c7de1858b3a 100644
--- a/configs/olimexino-stm32/src/stm32_appinit.c
+++ b/configs/olimexino-stm32/src/stm32_appinit.c
@@ -78,7 +78,7 @@ int board_app_initialize(void)
 
 #ifdef CONFIG_USBMSC
 #if !defined(CONFIG_NSH_BUILTIN_APPS) && !defined(CONFIG_SYSTEM_USBMSC)
-  ret = usbmsc_archinitialize();
+  ret = board_usbmsc_initialize(0);
 #endif
 #endif
 
diff --git a/configs/olimexino-stm32/src/stm32_usbmsc.c b/configs/olimexino-stm32/src/stm32_usbmsc.c
index ded0980a1da..a64957cfbde 100644
--- a/configs/olimexino-stm32/src/stm32_usbmsc.c
+++ b/configs/olimexino-stm32/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/olimexino-stm32/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           David Sidrane <david_s5@nscdg.com>
  *
@@ -44,8 +44,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "stm32.h"
 #include "olimexino-stm32.h"
@@ -60,8 +61,6 @@
 
 /* Configuration ************************************************************/
 
-/* Configuration ************************************************************/
-
 #ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
 #  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
@@ -83,14 +82,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization of the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see stm32_appinit.c).
diff --git a/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c b/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
index 81b9b1bb67a..e7caf0f94f5 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/pic32mx-starterkit/src/up_usbmsc.c
  *
- *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,19 +38,16 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/board.h>
 
 #include "pic32mx-starterkit.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
  *   Perform architecture specific initialization as needed to establish
@@ -58,7 +55,7 @@
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see
diff --git a/configs/pic32mx7mmb/src/pic32_usbmsc.c b/configs/pic32mx7mmb/src/pic32_usbmsc.c
index 9b6d499ea33..af40ad9bb48 100644
--- a/configs/pic32mx7mmb/src/pic32_usbmsc.c
+++ b/configs/pic32mx7mmb/src/pic32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/pic32mx7mmb/src/pic32_usbmsc.c
  *
- *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,19 +38,16 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/board.h>
 
 #include "pic32mx7mmb.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
  *   Perform architecture specific initialization as needed to establish
@@ -58,7 +55,7 @@
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see pic32_appinit.c).
diff --git a/configs/sam3u-ek/src/sam_usbmsc.c b/configs/sam3u-ek/src/sam_usbmsc.c
index 5cc1083cb6c..1780d27b101 100644
--- a/configs/sam3u-ek/src/sam_usbmsc.c
+++ b/configs/sam3u-ek/src/sam_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sam3u-ek/src/sam_usbmsc.c
  *
- *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -72,14 +73,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct sdio_dev_s *sdio;
   int ret;
diff --git a/configs/sam4e-ek/src/sam_usbmsc.c b/configs/sam4e-ek/src/sam_usbmsc.c
index b927d131ffb..bf23302a0ea 100644
--- a/configs/sam4e-ek/src/sam_usbmsc.c
+++ b/configs/sam4e-ek/src/sam_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sam4e-ek/src/sam_usbmsc.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "sam4e-ek.h"
 
 #ifdef CONFIG_SAM34_UDP
@@ -79,14 +81,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* Initialize the AT25 MTD driver */
 
diff --git a/configs/sama5d3-xplained/src/sam_usbmsc.c b/configs/sama5d3-xplained/src/sam_usbmsc.c
index 932e27cc81d..2ec32c01a69 100644
--- a/configs/sama5d3-xplained/src/sam_usbmsc.c
+++ b/configs/sama5d3-xplained/src/sam_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sama5d3-xplained/src/sam_usbmsc.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "sama5d3-xplained.h"
 
 #ifdef CONFIG_USBMSC
@@ -78,14 +80,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* Initialize the AT25 MTD driver */
 
diff --git a/configs/sama5d3x-ek/src/sam_usbmsc.c b/configs/sama5d3x-ek/src/sam_usbmsc.c
index 80eb0cbc225..b31ce7b0984 100644
--- a/configs/sama5d3x-ek/src/sam_usbmsc.c
+++ b/configs/sama5d3x-ek/src/sam_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sama5d3x-ek/src/sam_usbmsc.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "sama5d3x-ek.h"
 
 #ifdef CONFIG_USBMSC
@@ -78,14 +80,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* Initialize the AT25 MTD driver */
 
diff --git a/configs/sama5d4-ek/src/sam_usbmsc.c b/configs/sama5d4-ek/src/sam_usbmsc.c
index becb291a826..9a712d1ce1c 100644
--- a/configs/sama5d4-ek/src/sam_usbmsc.c
+++ b/configs/sama5d4-ek/src/sam_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sama5d4-ek/src/sam_usbmsc.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "sama5d4-ek.h"
 
 #ifdef CONFIG_USBMSC
@@ -78,14 +80,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* Initialize the AT25 MTD driver */
 
diff --git a/configs/samv71-xult/src/sam_usbmsc.c b/configs/samv71-xult/src/sam_usbmsc.c
index 45f79758237..c3fc23411f4 100644
--- a/configs/samv71-xult/src/sam_usbmsc.c
+++ b/configs/samv71-xult/src/sam_usbmsc.c
@@ -47,10 +47,6 @@
 
 #if defined(CONFIG_USBMSC) && !defined(CONFIG_USBMSC_COMPOSITE)
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/shenzhou/src/stm32_usbmsc.c b/configs/shenzhou/src/stm32_usbmsc.c
index 96606cf0a32..3c9911c7236 100644
--- a/configs/shenzhou/src/stm32_usbmsc.c
+++ b/configs/shenzhou/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/shenzhou/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the STM32 SPI-based MMC/SD block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 
 /****************************************************************************
@@ -61,14 +63,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see
diff --git a/configs/spark/src/stm32_appinit.c b/configs/spark/src/stm32_appinit.c
index 4da06bee792..d7007a6bd43 100644
--- a/configs/spark/src/stm32_appinit.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -281,9 +281,22 @@ int board_app_initialize(void)
   return OK;
 }
 
-int usbmsc_archinitialize(void)
+/****************************************************************************
+ * Name: board_usbmsc_initialize
+ *
+ * Description:
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
+ *
+ ****************************************************************************/
+
+int board_usbmsc_initialize(int port)
 {
-#if defined(CONFIG_LIB_BOARDCTL)
+#if 1 /* defined(CONFIG_LIB_BOARDCTL) */
+  /* REVIST: CONFIG_LIB_BOARDCTL is not a sufficient condition to determine
+   * board_app_initialize() has already been called or not.
+   */
+
   return OK;
 #else
   return board_app_initialize();
diff --git a/configs/stm3210e-eval/src/stm32_usbmsc.c b/configs/stm3210e-eval/src/stm32_usbmsc.c
index 18ee15415a9..f9e65878aac 100644
--- a/configs/stm3210e-eval/src/stm32_usbmsc.c
+++ b/configs/stm3210e-eval/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/stm3210e-eval/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the STM32 MMC/SD SDIO block driver.
@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -79,14 +80,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see stm32_appinit.c).
diff --git a/configs/teensy-2.0/src/at90usb_usbmsc.c b/configs/teensy-2.0/src/at90usb_usbmsc.c
index 21ec1b61311..d519c5d429c 100644
--- a/configs/teensy-2.0/src/at90usb_usbmsc.c
+++ b/configs/teensy-2.0/src/at90usb_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/teens-2.0/src/at90usb_usbmsc.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the AVR MMC/SD SPI block driver.
@@ -45,8 +45,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "at90usb.h"
 #include "teensy-20.h"
@@ -78,14 +79,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;
diff --git a/configs/twr-k60n512/src/k60_usbmsc.c b/configs/twr-k60n512/src/k60_usbmsc.c
index 1b658a6d083..c180faae744 100644
--- a/configs/twr-k60n512/src/k60_usbmsc.c
+++ b/configs/twr-k60n512/src/k60_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/twr-k60n512/src/k60_usbmsc.c
  *
- *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the Kinetis MMC/SD block driver.
@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -75,14 +76,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see k60_appinit.c).
diff --git a/configs/u-blox-c027/src/lpc17_usbmsc.c b/configs/u-blox-c027/src/lpc17_usbmsc.c
index 8403320e0a8..3a4f54d419a 100644
--- a/configs/u-blox-c027/src/lpc17_usbmsc.c
+++ b/configs/u-blox-c027/src/lpc17_usbmsc.c
@@ -45,8 +45,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "lpc17_ssp.h"
 
@@ -78,14 +79,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;
diff --git a/configs/viewtool-stm32f107/src/stm32_usbmsc.c b/configs/viewtool-stm32f107/src/stm32_usbmsc.c
index 370c4bd3c5d..f8462b46875 100644
--- a/configs/viewtool-stm32f107/src/stm32_usbmsc.c
+++ b/configs/viewtool-stm32f107/src/stm32_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/viewtool-stm32f107/src/stm32_usbmsc.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the STM32 SPI-based MMC/SD block driver.
@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 #include "viewtool_stm32f107.h"
 
@@ -62,14 +64,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see stm32_appinit.c).
diff --git a/configs/vsn/src/usbmsc.c b/configs/vsn/src/usbmsc.c
index fa6078b852f..979f176feb7 100644
--- a/configs/vsn/src/usbmsc.c
+++ b/configs/vsn/src/usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/vsn/src/usbmsc.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2016 Gregory Nutt. All rights reserved.
  *   Copyright (c) 2011 Uros Platise. All rights reserved.
  *
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -48,6 +48,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -80,14 +81,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct sdio_dev_s *sdio;
   int ret;
diff --git a/configs/zkit-arm-1769/src/lpc17_usbmsc.c b/configs/zkit-arm-1769/src/lpc17_usbmsc.c
index 9ad569a8742..3d51560056d 100644
--- a/configs/zkit-arm-1769/src/lpc17_usbmsc.c
+++ b/configs/zkit-arm-1769/src/lpc17_usbmsc.c
@@ -50,8 +50,9 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <nuttx/spi/spi.h>
+#include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/spi/spi.h>
 
 #include "lpc17_spi.h"
 #include "zkit-arm-1769.h"
@@ -83,14 +84,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbmsc_archinitialize
+ * Name: board_usbmsc_initialize
  *
  * Description:
- *   Perform architecture specific initialization
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
  *
  ****************************************************************************/
 
-int usbmsc_archinitialize(void)
+int board_usbmsc_initialize(int port)
 {
   FAR struct spi_dev_s *spi;
   int ret;