diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-25 20:17:59 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-25 20:17:59 +0000 |
commit | 657f0d2092b325bbaec6d61cce725295e38df61e (patch) | |
tree | 7dddd582f892fceb4d2b93f1202946d7cbeed23b /nuttx/configs/ea3131/src | |
parent | a2067c2d2efa28d2f252bec2893c470733935049 (diff) | |
download | px4-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/ea3131/src')
-rw-r--r-- | nuttx/configs/ea3131/src/Makefile | 4 | ||||
-rw-r--r-- | nuttx/configs/ea3131/src/up_usbmsc.c (renamed from nuttx/configs/ea3131/src/up_usbstrg.c) | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/nuttx/configs/ea3131/src/Makefile b/nuttx/configs/ea3131/src/Makefile index b49619440..685bfd997 100644 --- a/nuttx/configs/ea3131/src/Makefile +++ b/nuttx/configs/ea3131/src/Makefile @@ -59,8 +59,8 @@ endif ifeq ($(CONFIG_PAGING),y) CSRCS += up_fillpage.c endif -ifeq ($(CONFIG_USBSTRG),y) -CSRCS += up_usbstrg.c +ifeq ($(CONFIG_USBMSC),y) +CSRCS += up_usbmsc.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/ea3131/src/up_usbstrg.c b/nuttx/configs/ea3131/src/up_usbmsc.c index 5aef28733..422ff3603 100644 --- a/nuttx/configs/ea3131/src/up_usbstrg.c +++ b/nuttx/configs/ea3131/src/up_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/ea3131/src/up_usbstrg.c + * configs/ea3131/src/up_usbmsc.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -56,34 +56,34 @@ /* Configuration ************************************************************/ -#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 -# define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0 +#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1 +# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0 #endif -#ifndef CONFIG_EXAMPLES_USBSTRG_DEVPATH1 -# define CONFIG_EXAMPLES_USBSTRG_DEVPATH1 "/dev/ram" +#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1 +# define CONFIG_EXAMPLES_USBMSC_DEVPATH1 "/dev/ram" #endif -static const char g_source[] = CONFIG_EXAMPLES_USBSTRG_DEVPATH1; +static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1; static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER; -#define USBSTRG_NSECTORS 64 -#define USBSTRG_SECTORSIZE 512 -#define BUFFER_SIZE (USBSTRG_NSECTORS*USBSTRG_SECTORSIZE) +#define USBMSC_NSECTORS 64 +#define USBMSC_SECTORSIZE 512 +#define BUFFER_SIZE (USBMSC_NSECTORS*USBMSC_SECTORSIZE) /**************************************************************************** * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: usbstrg_archinitialize + * Name: usbmsc_archinitialize * * Description: * Perform architecture specific initialization * ****************************************************************************/ -int usbstrg_archinitialize(void) +int usbmsc_archinitialize(void) { uint8_t *pbuffer; int ret; @@ -91,17 +91,17 @@ int usbstrg_archinitialize(void) pbuffer = (uint8_t *) malloc (BUFFER_SIZE); if (!pbuffer) { - lib_lowprintf ("usbstrg_archinitialize: Failed to allocate ramdisk of size %d\n", + lib_lowprintf ("usbmsc_archinitialize: Failed to allocate ramdisk of size %d\n", BUFFER_SIZE); return -ENOMEM; } /* Register a RAMDISK device to manage this RAM image */ - ret = ramdisk_register(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, + ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, pbuffer, - USBSTRG_NSECTORS, - USBSTRG_SECTORSIZE, + USBMSC_NSECTORS, + USBMSC_SECTORSIZE, true); if (ret < 0) { |