summaryrefslogtreecommitdiff
path: root/nuttx/configs/teensy/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-01-25 20:17:59 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-01-25 20:17:59 +0000
commit657f0d2092b325bbaec6d61cce725295e38df61e (patch)
tree7dddd582f892fceb4d2b93f1202946d7cbeed23b /nuttx/configs/teensy/src
parenta2067c2d2efa28d2f252bec2893c470733935049 (diff)
downloadpx4-nuttx-657f0d2092b325bbaec6d61cce725295e38df61e.tar.gz
px4-nuttx-657f0d2092b325bbaec6d61cce725295e38df61e.tar.bz2
px4-nuttx-657f0d2092b325bbaec6d61cce725295e38df61e.zip
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
Diffstat (limited to 'nuttx/configs/teensy/src')
-rwxr-xr-xnuttx/configs/teensy/src/Makefile4
-rwxr-xr-xnuttx/configs/teensy/src/up_usbmsc.c (renamed from nuttx/configs/teensy/src/up_usbstrg.c)14
2 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/configs/teensy/src/Makefile b/nuttx/configs/teensy/src/Makefile
index e27f02663..36e887b74 100755
--- a/nuttx/configs/teensy/src/Makefile
+++ b/nuttx/configs/teensy/src/Makefile
@@ -41,8 +41,8 @@ CSRCS = up_boot.c
ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += up_leds.c
endif
-ifeq ($(CONFIG_USBSTRG),y)
-CSRCS += up_usbstrg.c
+ifeq ($(CONFIG_USBMSC),y)
+CSRCS += up_usbmsc.c
endif
ifeq ($(CONFIG_AVR_SPI),y)
CSRCS += up_spi.c
diff --git a/nuttx/configs/teensy/src/up_usbstrg.c b/nuttx/configs/teensy/src/up_usbmsc.c
index acc8cb071..7eb3307c6 100755
--- a/nuttx/configs/teensy/src/up_usbstrg.c
+++ b/nuttx/configs/teensy/src/up_usbmsc.c
@@ -1,6 +1,6 @@
/****************************************************************************
- * configs/teensy/src/up_usbstrg.c
- * arch/arm/src/board/up_usbstrg.c
+ * configs/teensy/src/up_usbmsc.c
+ * arch/arm/src/board/up_usbmsc.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -58,8 +58,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 */
@@ -99,14 +99,14 @@
****************************************************************************/
/****************************************************************************
- * 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;
@@ -126,7 +126,7 @@ int usbstrg_archinitialize(void)
message("Binding SPI port to MMC/SD slot\n");
- ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, AVR_MMCSDSLOTNO, spi);
+ ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, AVR_MMCSDSLOTNO, spi);
if (ret < 0)
{
message("mmcsd_spislotinitialize failed: %d\n", ret);