Massive name change USB STRG -> USB MSC

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

2 files changed, 14 insertions, 14 deletions

diff --git a/nuttx/configs/nucleus2g/src/Makefile b/nuttx/configs/nucleus2g/src/Makefile
index 303bd2b94..42a8b5cd2 100755
--- a/nuttx/configs/nucleus2g/src/Makefile
+++ b/nuttx/configs/nucleus2g/src/Makefile
@@ -42,8 +42,8 @@ CSRCS		= up_boot.c up_leds.c up_ssp.c up_outputs.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
-ifeq ($(CONFIG_USBSTRG),y)
-CSRCS		+= up_usbstrg.c
+ifeq ($(CONFIG_USBMSC),y)
+CSRCS		+= up_usbmsc.c
 endif
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
diff --git a/nuttx/configs/nucleus2g/src/up_usbstrg.c b/nuttx/configs/nucleus2g/src/up_usbmsc.c
index 849611440..c3d074b54 100755
--- a/nuttx/configs/nucleus2g/src/up_usbstrg.c
+++ b/nuttx/configs/nucleus2g/src/up_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/nucleus2g/src/up_usbstrg.c
+ * configs/nucleus2g/src/up_usbmsc.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -54,8 +54,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
+#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -96,48 +96,48 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbstrg_archinitialize
+ * Name: usbmsc_archinitialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int usbstrg_archinitialize(void)
+int usbmsc_archinitialize(void)
 {
   FAR struct spi_dev_s *spi;
   int ret;
 
   /* Get the SPI port */
 
-  message("usbstrg_archinitialize: Initializing SPI port %d\n",
+  message("usbmsc_archinitialize: Initializing SPI port %d\n",
           LPC17XX_MMCSDSPIPORTNO);
 
   spi = up_spiinitialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
-      message("usbstrg_archinitialize: Failed to initialize SPI port %d\n",
+      message("usbmsc_archinitialize: Failed to initialize SPI port %d\n",
               LPC17XX_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
-  message("usbstrg_archinitialize: Successfully initialized SPI port %d\n",
+  message("usbmsc_archinitialize: Successfully initialized SPI port %d\n",
           LPC17XX_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
-  message("usbstrg_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
+  message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      message("usbstrg_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+      message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
               LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO, ret);
       return ret;
     }
 
-  message("usbstrg_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
+  message("usbmsc_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
   return OK;
 }