diff --git a/fs/smartfs/Make.defs b/fs/smartfs/Make.defs index 97bf50fbb9..3be1487cde 100644 --- a/fs/smartfs/Make.defs +++ b/fs/smartfs/Make.defs @@ -40,11 +40,6 @@ ifeq ($(CONFIG_FS_SMARTFS),y) ASRCS += CSRCS += smartfs_smart.c smartfs_utils.c smartfs_procfs.c -# Files required for mksmartfs utility function - -ASRCS += -CSRCS += smartfs_mksmartfs.c - # Include SMART build support DEPPATH += --dep-path smartfs diff --git a/fs/smartfs/smartfs_mksmartfs.c b/fs/smartfs/smartfs_mksmartfs.c deleted file mode 100644 index 076915e169..0000000000 --- a/fs/smartfs/smartfs_mksmartfs.c +++ /dev/null @@ -1,191 +0,0 @@ -/**************************************************************************** - * fs/smartfs/smartfs_mksmartfs.c - * - * Copyright (C) 2013 Ken Pettit. All rights reserved. - * Author: Ken Pettit - * - * 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. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "smartfs.h" - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: mksmartfs - * - * Description: - * Make a SMART Flash file system image on the specified block device - * - * Inputs: - * pathname - the full path to a registered block driver - * nrootdirs - Number of root directory entries to create. - * - * Return: - * Zero (OK) on success; -1 (ERROR) on failure with errno set appropriately: - * - * EINVAL - NULL block driver string, bad number of FATS in 'fmt', bad FAT - * size in 'fmt', bad cluster size in 'fmt' - * ENOENT - 'pathname' does not refer to anything in the filesystem. - * ENOTBLK - 'pathname' does not refer to a block driver - * EACCES - block driver does not support wrie or geometry methods - * - * Assumptions: - * - The caller must assure that the block driver is not mounted and not in - * use when this function is called. The result of formatting a mounted - * device is indeterminate (but likely not good). - * - ****************************************************************************/ - -#ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS -int mksmartfs(FAR const char *pathname, uint8_t nrootdirs) -#else -int mksmartfs(FAR const char *pathname) -#endif -{ - FAR struct inode *inode; - struct smart_format_s fmt; - int ret; - int x; - uint8_t type; - struct smart_read_write_s request; - - /* Find the inode of the block driver indentified by 'source' */ - - ret = open_blockdriver(pathname, 0, &inode); - if (ret < 0) - { - fdbg("Failed to open %s\n", pathname); - goto errout; - } - - /* Make sure that the inode supports the write and geometry methods at a minimum */ - - if (!inode->u.i_bops->write || !inode->u.i_bops->geometry) - { - fdbg("%s does not support write or geometry methods\n", pathname); - ret = -EACCES; - goto errout_with_driver; - } - - /* Validate the block device is a SMART device */ - - /* Perform a low-level SMART format */ - -#ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS - ret = inode->u.i_bops->ioctl(inode, BIOC_LLFORMAT, nrootdirs); -#else - ret = inode->u.i_bops->ioctl(inode, BIOC_LLFORMAT, 0); -#endif - if (ret != OK) - { - fdbg("Error creating low-level format: %d\n", ret); - goto errout_with_driver; - } - - /* Get the format information so we know how big the sectors are */ - - ret = inode->u.i_bops->ioctl(inode, BIOC_GETFORMAT, (unsigned long) &fmt); - - /* Now Write the filesystem to media. Loop for each root dir entry and - * allocate the reserved Root Dir Enty, then write a blank root dir for it. - */ - - type = SMARTFS_SECTOR_TYPE_DIR; - request.offset = 0; - request.count = 1; - request.buffer = &type; - x = 0; -#ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS - for (; x < nrootdirs; x++) -#endif - { - ret = inode->u.i_bops->ioctl(inode, BIOC_ALLOCSECT, SMARTFS_ROOT_DIR_SECTOR + x); - if (ret != SMARTFS_ROOT_DIR_SECTOR + x) - { - ret = -EIO; - goto errout_with_driver; - } - - /* Mark this block as a directory entry */ - - request.logsector = SMARTFS_ROOT_DIR_SECTOR + x; - - /* Issue a write to the sector, single byte */ - - ret = inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long) &request); - if (ret != 0) - { - ret = -EIO; - goto errout_with_driver; - } - } - -errout_with_driver: - /* Close the driver */ - - (void)close_blockdriver(inode); - -errout: - /* Release all allocated memory */ - - /* Return any reported errors */ - - if (ret < 0) - { - set_errno(-ret); - return ERROR; - } - - return OK; -} diff --git a/include/nuttx/fs/mksmartfs.h b/include/nuttx/fs/mksmartfs.h deleted file mode 100644 index f907ba305a..0000000000 --- a/include/nuttx/fs/mksmartfs.h +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** - * include/nuttx/fs/mksmartfs.h - * - * Copyright (C) 2013, 2015 Ken Pettit. All rights reserved. - * Author: Ken Pettit - * - * 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 __INCLUDE_NUTTX_SMART_MKSMARTFS_H -#define __INCLUDE_NUTTX_SMART_MKSMARTFS_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Types - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#undef EXTERN -#if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" -{ -#else -#define EXTERN extern -#endif - -/**************************************************************************** - * Name: mksmartfs - * - * Description: - * Make a SMART (Sector Mapped Allocation for Really Tiny) Flash file - * system image on the specified block device (must be a SMART device). - * - * Inputs: - * pathname - the full path to a registered block driver - * nrootdirs - the number of Root Directory entries to support - * on this device (supports multiple mount points). - * - * Return: - * Zero (OK) on success; -1 (ERROR) on failure with errno set appropriately: - * - * EINVAL - NULL block driver string - * ENOENT - 'pathname' does not refer to anything in the filesystem. - * ENOTBLK - 'pathname' does not refer to a block driver - * EACCESS - block driver does not support write or geometry methods or - * is not a SMART device - * - * Assumptions: - * - The caller must assure that the block driver is not mounted and not in - * use when this function is called. The result of formatting a mounted - * device is indeterminate (but likely not good). - * - ****************************************************************************/ - -#ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS -int mksmartfs(FAR const char *pathname, uint8_t nrootdirs); -#else -int mksmartfs(FAR const char *pathname); -#endif - -#undef EXTERN -#if defined(__cplusplus) -} -#endif - -#endif /* __INCLUDE_NUTTX_SMART_MKSMARTFS_H */ diff --git a/include/nuttx/fs/smart.h b/include/nuttx/fs/smart.h index 2621dd77f6..f3bff10cb6 100644 --- a/include/nuttx/fs/smart.h +++ b/include/nuttx/fs/smart.h @@ -55,6 +55,15 @@ #define SMART_FMT_ISFORMATTED 0x01 #define SMART_FMT_HASBYTEWRITE 0x02 +/* The logical sector number of the root directory. */ + +#define SMARTFS_ROOT_DIR_SECTOR 3 + +/* Defines the sector types */ + +#define SMARTFS_SECTOR_TYPE_DIR 1 +#define SMARTFS_SECTOR_TYPE_FILE 2 + /**************************************************************************** * Public Types ****************************************************************************/