diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-10 09:42:58 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-10 09:42:58 -0600 |
commit | c89f9dcebca9bded25a85d13c436219c7411e973 (patch) | |
tree | bb38b317494fa6721ad4dc7e5ba55e2a2a58169f | |
parent | 25c295c69751b8a65c692af565abe4cccfc281c4 (diff) | |
download | px4-nuttx-c89f9dcebca9bded25a85d13c436219c7411e973.tar.gz px4-nuttx-c89f9dcebca9bded25a85d13c436219c7411e973.tar.bz2 px4-nuttx-c89f9dcebca9bded25a85d13c436219c7411e973.zip |
Move ramdisk.h to include/nutt/fs/ramdisk.h
-rw-r--r-- | apps/examples/elf/elf_main.c | 2 | ||||
-rw-r--r-- | apps/examples/mount/ramdisk.c | 2 | ||||
-rw-r--r-- | apps/examples/nxflat/nxflat_main.c | 2 | ||||
-rw-r--r-- | apps/examples/posix_spawn/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/posix_spawn/spawn_main.c | 2 | ||||
-rw-r--r-- | apps/examples/romfs/romfs_main.c | 2 | ||||
-rw-r--r-- | apps/examples/thttpd/thttpd_main.c | 2 | ||||
-rw-r--r-- | apps/nshlib/nsh_fscmds.c | 2 | ||||
-rw-r--r-- | apps/nshlib/nsh_romfsetc.c | 2 | ||||
-rw-r--r-- | nuttx/ChangeLog | 2 | ||||
-rw-r--r-- | nuttx/arch/sim/src/up_blockdevice.c | 2 | ||||
-rw-r--r-- | nuttx/configs/ea3131/src/up_usbmsc.c | 2 | ||||
-rw-r--r-- | nuttx/configs/ea3152/src/up_usbmsc.c | 2 | ||||
-rw-r--r-- | nuttx/drivers/Kconfig | 2 | ||||
-rw-r--r-- | nuttx/drivers/README.txt | 2 | ||||
-rw-r--r-- | nuttx/drivers/ramdisk.c | 2 | ||||
-rw-r--r-- | nuttx/include/nuttx/fs/ramdisk.h (renamed from nuttx/include/nuttx/ramdisk.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/fs/smart.h | 2 |
18 files changed, 23 insertions, 21 deletions
diff --git a/apps/examples/elf/elf_main.c b/apps/examples/elf/elf_main.c index 2b5c0eb5e..ce43c241f 100644 --- a/apps/examples/elf/elf_main.c +++ b/apps/examples/elf/elf_main.c @@ -50,7 +50,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include <nuttx/binfmt/binfmt.h> #include <nuttx/binfmt/elf.h> #include <nuttx/binfmt/symtab.h> diff --git a/apps/examples/mount/ramdisk.c b/apps/examples/mount/ramdisk.c index 83ef74e42..2b9ffd79e 100644 --- a/apps/examples/mount/ramdisk.c +++ b/apps/examples/mount/ramdisk.c @@ -45,7 +45,7 @@ #include <string.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include <nuttx/fs/mkfatfs.h> #include "mount.h" diff --git a/apps/examples/nxflat/nxflat_main.c b/apps/examples/nxflat/nxflat_main.c index 0c4846a5c..e3b06addb 100644 --- a/apps/examples/nxflat/nxflat_main.c +++ b/apps/examples/nxflat/nxflat_main.c @@ -49,7 +49,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include <nuttx/binfmt/binfmt.h> #include <nuttx/binfmt/nxflat.h> diff --git a/apps/examples/posix_spawn/Makefile b/apps/examples/posix_spawn/Makefile index 0bfa36e55..77b6383ed 100644 --- a/apps/examples/posix_spawn/Makefile +++ b/apps/examples/posix_spawn/Makefile @@ -120,7 +120,7 @@ spawn_main.o: spawn_main.c \ $(TOPDIR)/include/spawn.h \ $(TOPDIR)/include/debug.h \ $(TOPDIR)/include/errno.h \ - $(TOPDIR)/include/nuttx/ramdisk.h \ + $(TOPDIR)/include/nuttx/fs/ramdisk.h \ $(TOPDIR)/include/nuttx/binfmt/elf.h \ $(TOPDIR)/include/nuttx/binfmt/symtab.h \ filesystem/romfs.h diff --git a/apps/examples/posix_spawn/spawn_main.c b/apps/examples/posix_spawn/spawn_main.c index 0ca5f9107..7a39a24b0 100644 --- a/apps/examples/posix_spawn/spawn_main.c +++ b/apps/examples/posix_spawn/spawn_main.c @@ -51,7 +51,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include <nuttx/binfmt/elf.h> #include <nuttx/binfmt/symtab.h> diff --git a/apps/examples/romfs/romfs_main.c b/apps/examples/romfs/romfs_main.c index 3437cb8ac..d39c8ec2b 100644 --- a/apps/examples/romfs/romfs_main.c +++ b/apps/examples/romfs/romfs_main.c @@ -69,7 +69,7 @@ #include <dirent.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include "romfs_testdir.h" diff --git a/apps/examples/thttpd/thttpd_main.c b/apps/examples/thttpd/thttpd_main.c index 9d08824e6..71fc8de6a 100644 --- a/apps/examples/thttpd/thttpd_main.c +++ b/apps/examples/thttpd/thttpd_main.c @@ -55,7 +55,7 @@ #include <apps/netutils/uiplib.h> #include <apps/netutils/thttpd.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include <nuttx/binfmt/binfmt.h> #include <nuttx/binfmt/nxflat.h> #ifdef CONFIG_NET_SLIP diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c index ea30bd3b5..19fc01afa 100644 --- a/apps/nshlib/nsh_fscmds.c +++ b/apps/nshlib/nsh_fscmds.c @@ -49,7 +49,7 @@ # if !defined(CONFIG_DISABLE_MOUNTPOINT) # ifdef CONFIG_FS_READABLE /* Need at least one filesytem in configuration */ # include <sys/mount.h> -# include <nuttx/ramdisk.h> +# include <nuttx/fs/ramdisk.h> # endif # ifdef CONFIG_FS_FAT # include <nuttx/fs/mkfatfs.h> diff --git a/apps/nshlib/nsh_romfsetc.c b/apps/nshlib/nsh_romfsetc.c index 4134b45a3..6f538b4c5 100644 --- a/apps/nshlib/nsh_romfsetc.c +++ b/apps/nshlib/nsh_romfsetc.c @@ -43,7 +43,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include "nsh.h" diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index d59af9668..76a55e2c5 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6191,4 +6191,6 @@ (2013-12-10). * include/nuttx/fs/smart.h: Move smart.h to include/fs/smart.h (2013-12-10). + * include/nuttx/fs/ramdisk.h: Move ramdisk.h to include/fs/ramdisk.h + (2013012-10). diff --git a/nuttx/arch/sim/src/up_blockdevice.c b/nuttx/arch/sim/src/up_blockdevice.c index edcb6f377..abfda4a6a 100644 --- a/nuttx/arch/sim/src/up_blockdevice.c +++ b/nuttx/arch/sim/src/up_blockdevice.c @@ -44,7 +44,7 @@ #include <string.h> #include <errno.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> #include "up_internal.h" diff --git a/nuttx/configs/ea3131/src/up_usbmsc.c b/nuttx/configs/ea3131/src/up_usbmsc.c index 80f8eee9b..66bdda6f6 100644 --- a/nuttx/configs/ea3131/src/up_usbmsc.c +++ b/nuttx/configs/ea3131/src/up_usbmsc.c @@ -49,7 +49,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/fs.h> #include <nuttx/fs/mkfatfs.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/configs/ea3152/src/up_usbmsc.c b/nuttx/configs/ea3152/src/up_usbmsc.c index 66fb11694..6a358ca1d 100644 --- a/nuttx/configs/ea3152/src/up_usbmsc.c +++ b/nuttx/configs/ea3152/src/up_usbmsc.c @@ -49,7 +49,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/fs.h> #include <nuttx/fs/mkfatfs.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig index 878d8120d..2d244723c 100644 --- a/nuttx/drivers/Kconfig +++ b/nuttx/drivers/Kconfig @@ -41,7 +41,7 @@ config RAMDISK ---help--- Can be used to set up a block of memory or (read-only) FLASH as a block driver that can be mounted as a files system. See - include/nuttx/ramdisk.h. + include/nuttx/fs/ramdisk.h. menuconfig CAN bool "CAN Driver Support" diff --git a/nuttx/drivers/README.txt b/nuttx/drivers/README.txt index d4c3982e3..df5d13fef 100644 --- a/nuttx/drivers/README.txt +++ b/nuttx/drivers/README.txt @@ -34,7 +34,7 @@ pwm.c ramdisk.c Can be used to set up a block of memory or (read-only) FLASH as a block driver that can be mounted as a files system. See - include/nuttx/ramdisk.h. + include/nuttx/fs/ramdisk.h. ramlog.c This is a driver that was intended to support debugging output, diff --git a/nuttx/drivers/ramdisk.c b/nuttx/drivers/ramdisk.c index 91912b25c..7d5d871a1 100644 --- a/nuttx/drivers/ramdisk.c +++ b/nuttx/drivers/ramdisk.c @@ -51,7 +51,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/fs.h> -#include <nuttx/ramdisk.h> +#include <nuttx/fs/ramdisk.h> /**************************************************************************** * Private Definitions diff --git a/nuttx/include/nuttx/ramdisk.h b/nuttx/include/nuttx/fs/ramdisk.h index 7d4017c11..d00a0e2d5 100644 --- a/nuttx/include/nuttx/ramdisk.h +++ b/nuttx/include/nuttx/fs/ramdisk.h @@ -1,7 +1,7 @@ /**************************************************************************** - * include/nuttx/ramdisk.h + * include/nuttx/fs/ramdisk.h * - * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_RAMDISK_H -#define __INCLUDE_NUTTX_RAMDISK_H +#ifndef __INCLUDE_NUTTX_FS_RAMDISK_H +#define __INCLUDE_NUTTX_FS_RAMDISK_H /**************************************************************************** * Included Files @@ -96,4 +96,4 @@ EXTERN int romdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors, } #endif -#endif /* __INCLUDE_NUTTX_RAMDISK_H */ +#endif /* __INCLUDE_NUTTX_FS_RAMDISK_H */ diff --git a/nuttx/include/nuttx/fs/smart.h b/nuttx/include/nuttx/fs/smart.h index 7ec7de558..6553e3417 100644 --- a/nuttx/include/nuttx/fs/smart.h +++ b/nuttx/include/nuttx/fs/smart.h @@ -86,7 +86,7 @@ struct smart_read_write_s uint16_t logsector; /* The logical sector number */ uint16_t offset; /* Offset within the sector to write to */ uint16_t count; /* Number of bytes to write */ - const uint8_t *buffer; /* Pointer to the data to write */ + const uint8_t *buffer; /* Pointer to the data to write */ }; /**************************************************************************** |