Add fs/tmpfs. Nothing much there yet

This commit is contained in:
Gregory Nutt
2015-10-08 10:54:41 -06:00
parent 06cd5b2fcc
commit e947ea587d
5 changed files with 296 additions and 26 deletions
+2
View File
@@ -11013,4 +11013,6 @@
parameters to match names used on OpenGroup.org (2015-10-02). parameters to match names used on OpenGroup.org (2015-10-02).
* drivers/lcd/st7565.c: Extend to include support for the ERC12864-3. * drivers/lcd/st7565.c: Extend to include support for the ERC12864-3.
From Pierre-noel Bouteville (2015-10-07). From Pierre-noel Bouteville (2015-10-07).
* fs/tmpfs: Created a directory that will eventually hold a trivial
temporary RAM file file system (2015-10-0i8).
+27 -26
View File
@@ -188,39 +188,40 @@ struct romfs_dirinfo_s
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
EXTERN void romfs_semtake(struct romfs_mountpt_s *rm); /****************************************************************************
EXTERN void romfs_semgive(struct romfs_mountpt_s *rm); * Public Function Prototypes
EXTERN int romfs_hwread(struct romfs_mountpt_s *rm, uint8_t *buffer, ****************************************************************************/
uint32_t sector, unsigned int nsectors);
EXTERN int romfs_filecacheread(struct romfs_mountpt_s *rm, void romfs_semtake(FAR struct romfs_mountpt_s *rm);
struct romfs_file_s *rf, uint32_t sector); void romfs_semgive(FAR struct romfs_mountpt_s *rm);
EXTERN int romfs_hwconfigure(struct romfs_mountpt_s *rm); int romfs_hwread(FAR struct romfs_mountpt_s *rm, FAR uint8_t *buffer,
EXTERN int romfs_fsconfigure(struct romfs_mountpt_s *rm); uint32_t sector, unsigned int nsectors);
EXTERN int romfs_fileconfigure(struct romfs_mountpt_s *rm, int romfs_filecacheread(FAR struct romfs_mountpt_s *rm,
struct romfs_file_s *rf); FAR struct romfs_file_s *rf, uint32_t sector);
EXTERN int romfs_checkmount(struct romfs_mountpt_s *rm); int romfs_hwconfigure(FAR struct romfs_mountpt_s *rm);
EXTERN int romfs_finddirentry(struct romfs_mountpt_s *rm, int romfs_fsconfigure(FAR struct romfs_mountpt_s *rm);
struct romfs_dirinfo_s *dirinfo, int romfs_fileconfigure(FAR struct romfs_mountpt_s *rm,
const char *path); FAR struct romfs_file_s *rf);
EXTERN int romfs_parsedirentry(struct romfs_mountpt_s *rm, int romfs_checkmount(FAR struct romfs_mountpt_s *rm);
uint32_t offset, uint32_t *poffset, uint32_t *pnext, int romfs_finddirentry(FAR struct romfs_mountpt_s *rm,
uint32_t *pinfo, uint32_t *psize); FAR struct romfs_dirinfo_s *dirinfo,
EXTERN int romfs_parsefilename(struct romfs_mountpt_s *rm, uint32_t offset, FAR const char *path);
char *pname); int romfs_parsedirentry(FAR struct romfs_mountpt_s *rm,
EXTERN int romfs_datastart(struct romfs_mountpt_s *rm, uint32_t offset, uint32_t offset, FAR uint32_t *poffset, FAR uint32_t *pnext,
uint32_t *start); FAR uint32_t *pinfo, FAR uint32_t *psize);
int romfs_parsefilename(FAR struct romfs_mountpt_s *rm, uint32_t offset,
FAR char *pname);
int romfs_datastart(FAR struct romfs_mountpt_s *rm, uint32_t offset,
FAR uint32_t *start);
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
+51
View File
@@ -0,0 +1,51 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
config FS_TMPFS
bool "TMPFS file system"
default n
depends on !DISABLE_MOUNTPOINT && EXPERIMENTAL
select FS_READABLE
select FS_WRITABLE
---help---
Enable TMPFS filesystem support
if FS_TMPFS
config FS_TMPFS_DIRECTORY_ALLOCGUARD
int "Directory object over-allocation"
default 64
---help---
In order to avoid frequent reallocations, a little more memory than
needed is always allocated. This permits the directory to grow
without so many realloctions.
config FS_TMPFS_DIRECTORY_FREEGUARD
int "Directory under free"
default 128
---help---
In order to avoid frequent reallocations, a lot of free memory has
to be available before a directory entry shrinks (via reallocation)
little more memory than needed is always allocated. This permits
the directory to shrink without so many realloctions.
config FS_TMPFS_FILE_ALLOCGUARD
int "Directory object over-allocation"
default 512
---help---
In order to avoid frequent reallocations, a little more memory than
needed is always allocated. This permits the file to grow without
so many realloctions.
config FS_TMPFS_FILE_FREEGUARD
int "Directory under free"
default 1024
---help---
In order to avoid frequent reallocations, a lot of free memory has
to be available before a directory entry shrinks (via reallocation)
little more memory than needed is always allocated. This permits
the file to shrink without so many realloctions.
endif
+47
View File
@@ -0,0 +1,47 @@
############################################################################
# fs/romfs/Make.defs
#
# Copyright (C) 2008, 2011, 2013 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.
#
############################################################################
ifeq ($(CONFIG_FS_ROMFS),y)
# Files required for ROMFS file system support
ASRCS +=
CSRCS += fs_romfs.c fs_romfsutil.c
# Include ROMFS build support
DEPPATH += --dep-path romfs
VPATH += :romfs
endif
+169
View File
@@ -0,0 +1,169 @@
/****************************************************************************
* fs/tmpfs/fs_tmpfs.h
*
* Copyright (C) 2015 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.
*
****************************************************************************/
#ifndef __FS_TMPFS_FS_TMPFS_H
#define __FS_TMPFS_FS_TMPFS_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
#include <semaphore.h>
#include <nuttx/fs/fs.h>
#ifndef CONFIG_DISABLE_MOUNTPOINT
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define TFO_FLAG_UNLINKED (1 << 0) /* Bit 0: File is unlinked */
/****************************************************************************
* Public Types
****************************************************************************/
/* TMPFS memory object types */
enum tmpfs_objtype_e
{
TMPFS_DIRECTORY = 0, /* Directory */
TMPFS_REGULAR /* Regular file */
};
/* The generic form of a TMPFS memory object */
struct tmpfs_object_s
{
size_t to_alloc; /* Allocated size of the memory object */
uint8_t to_type; /* See enum tmpfs_objtype_e */
uint8_t to_refs; /* Reference count */
sem_t to_exclsem; /* Supports exclusive access to the object */
};
/* The form of one directory entry */
struct tmpfs_dirent_s
{
FAR struct tmpfs_object_s *rde_object;
FAR char *rde_name;
};
/* The form of a directory memory object */
struct tmpfs_directory_s
{
/* First fields must match common TMPFS object layout */
size_t tdo_alloc; /* Allocated size of the directory object */
uint8_t tdo_type; /* See enum tmpfs_objtype_e */
uint8_t tdo_refs; /* Reference count */
sem_t tdo_exclsem; /* Supports exclusive access to the directory */
/* Remaining fields are unique to a directory object */
uint16_t tdo_nentries; /* Number of directory entries */
struct tmpfs_dirent_s tdo_entry[1];
};
#define SIZEOF_TMPFS_DIRECTORY(n) \
(sizeof(struct tmpfs_directory_s) + ((n) - 1)*sizeof(struct tmpfs_dirent_s))
/* The form of a regular file memory object
*
* NOTE that in this very simplified implementation, there is no per-open
* state. The file memory object also serves as the open file object,
* saving an allocation. This has the negative side effect that no per-
* open state can be retained (such as open flags).
*/
struct tmpfs_file_s
{
/* First fields must match common TMPFS object layout */
size_t tfo_alloc; /* Allocated size of the file object */
uint8_t tfo_type; /* See enum tmpfs_objtype_e */
uint8_t tfo_refs; /* Reference count */
sem_t tfo_exclsem; /* Supports exclusive access to the file */
/* Remaining fields are unique to a directory object */
uint8_t tfo_flags; /* See TFO_FLAG_* definitions */
size_t tfo_size; /* Valid file size */
uint8_t tfo_data[1]; /* File data starts here */
};
#define SIZEOF_TMPFS_DIRECTORY(n) (sizeof(struct tmpfs_file_s) + (n) - 1)
/* This structure represents one instance of a TMPFS file system */
struct tmpfs_s
{
/* The root directory */
FAR struct tmpfs_directory_s *r_root;
sem_t r_exclsem; /* Supports exclusive access to the file system */
};
/****************************************************************************
* Public Data
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
EXTERN const struct mountpt_operations tmpfs_operations;
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __FS_TMPFS_FS_TMPFS_H */