sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move renaming files in fs/. to fs/vfs/. (Don't all belong there)

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-28 11:46:11 -06:00
parent 1426e424ff
commit ff73be870e
24 changed files with 115 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fs/Makefile
View File

@ -40,54 +40,18 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS =
# If there are no file descriptors configured, then a small part of the
# logic in this directory may still apply to socket descriptors
ifeq ($(CONFIG_NFILE_DESCRIPTORS),0)
ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0)
# Socket descriptor support
CSRCS += fs_close.c fs_read.c fs_write.c fs_ioctl.c fs_poll.c fs_select.c
endif
# Support for network access using streams
ifneq ($(CONFIG_NFILE_STREAMS),0)
CSRCS += fs_fdopen.c
endif
else
# Common file/socket descriptor support
CSRCS += fs_close.c fs_dup.c fs_dup2.c fs_fcntl.c fs_filedup.c fs_filedup2.c
CSRCS += fs_ioctl.c fs_lseek.c fs_mkdir.c fs_open.c fs_poll.c fs_read.c
CSRCS += fs_rename.c fs_rmdir.c fs_stat.c fs_statfs.c fs_select.c
CSRCS += fs_unlink.c fs_write.c
DEPPATH = --dep-path .
VPATH = .
include inode/Make.defs
include vfs/Make.defs
include driver/Make.defs
include dirent/Make.defs
include mmap/Make.defs
# Stream support
ifneq ($(CONFIG_NFILE_STREAMS),0)
CSRCS += fs_fdopen.c
endif
# Support for sendfile()
ifeq ($(CONFIG_NET_SENDFILE),y)
CSRCS += fs_sendfile.c
endif
# Additional files required is mount-able file systems are supported
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
include mount/Make.defs

91
fs/vfs/Make.defs Normal file
View File

@ -0,0 +1,91 @@
############################################################################
# fs/vfs/Make.defs
#
# Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
# If there are no file descriptors configured, then a small part of the
# logic in this directory may still apply to socket descriptors
ifeq ($(CONFIG_NFILE_DESCRIPTORS),0)
ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0)
# Socket descriptor support
CSRCS += fs_close.c fs_read.c fs_write.c fs_ioctl.c fs_poll.c fs_select.c
# Support for network access using streams
ifneq ($(CONFIG_NFILE_STREAMS),0)
CSRCS += fs_fdopen.c
endif
# Support for sendfile()
ifeq ($(CONFIG_NET_SENDFILE),y)
CSRCS += fs_sendfile.c
endif
# Include vfs build support
DEPPATH += --dep-path vfs
VPATH += :vfs
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)vfs}
endif
else
# Common file/socket descriptor support
CSRCS += fs_close.c fs_dup.c fs_dup2.c fs_fcntl.c fs_filedup.c fs_filedup2.c
CSRCS += fs_ioctl.c fs_lseek.c fs_mkdir.c fs_open.c fs_poll.c fs_read.c
CSRCS += fs_rename.c fs_rmdir.c fs_stat.c fs_statfs.c fs_select.c
CSRCS += fs_unlink.c fs_write.c
# Stream support
ifneq ($(CONFIG_NFILE_STREAMS),0)
CSRCS += fs_fdopen.c
endif
# Support for sendfile()
ifeq ($(CONFIG_NET_SENDFILE),y)
CSRCS += fs_sendfile.c
endif
# Include vfs build support
DEPPATH += --dep-path vfs
VPATH += :vfs
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)vfs}
endif

2
fs/fs_close.c → fs/vfs/fs_close.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_close.c
* fs/vfs/fs_close.c
*
* Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_dup.c → fs/vfs/fs_dup.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_dup.c
* fs/vfs/fs_dup.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_dup2.c → fs/vfs/fs_dup2.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_dup2.c
* fs/vfs/fs_dup2.c
*
* Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_fcntl.c → fs/vfs/fs_fcntl.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_fcntl.c
* fs/vfs/fs_fcntl.c
*
* Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_fdopen.c → fs/vfs/fs_fdopen.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_fdopen.c
* fs/vfs/fs_fdopen.c
*
* Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_filedup.c → fs/vfs/fs_filedup.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_filedup.c
* fs/vfs/fs_filedup.c
*
* Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_filedup2.c → fs/vfs/fs_filedup2.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_filedup2.c
* fs/vfs/fs_filedup2.c
*
* Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_fsync.c → fs/vfs/fs_fsync.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_fsync.c
* fs/vfs/fs_fsync.c
*
* Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_ioctl.c → fs/vfs/fs_ioctl.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_ioctl.c
* fs/vfs/fs_ioctl.c
*
* Copyright (C) 2007-2010, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_lseek.c → fs/vfs/fs_lseek.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_lseek.c
* fs/vfs/fs_lseek.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_mkdir.c → fs/vfs/fs_mkdir.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_mkdir.c
* fs/vfs/fs_mkdir.c
*
* Copyright (C) 2007, 2008, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_open.c → fs/vfs/fs_open.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs_open.c
* fs/vfs/fs_open.c
*
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_poll.c → fs/vfs/fs_poll.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_poll.c
* fs/vfs/fs_poll.c
*
* Copyright (C) 2008-2009, 2012-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_read.c → fs/vfs/fs_read.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_read.c
* fs/vfs/fs_read.c
*
* Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_rename.c → fs/vfs/fs_rename.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_rename.c
* fs/vfs/fs_rename.c
*
* Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_rmdir.c → fs/vfs/fs_rmdir.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_rmdir.c
* fs/vfs/fs_rmdir.c
*
* Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_select.c → fs/vfs/fs_select.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_select.c
* fs/vfs/fs_select.c
*
* Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_sendfile.c → fs/vfs/fs_sendfile.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* fs/fs_sendfile.c
* fs/vfs/fs_sendfile.c
*
* Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_stat.c → fs/vfs/fs_stat.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_stat.c
* fs/vfs/fs_stat.c
*
* Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_statfs.c → fs/vfs/fs_statfs.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_statfs.c
* fs/vfs/fs_statfs.c
*
* Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_unlink.c → fs/vfs/fs_unlink.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs_unlink.c
* fs/vfs/fs_unlink.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
fs/fs_write.c → fs/vfs/fs_write.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* fs/fs_write.c
* fs/vfs/fs_write.c
*
* Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>