diff --git a/arch/rgmp/src/bridge.c b/arch/rgmp/src/bridge.c index 5762e0feabe..71ab7444751 100644 --- a/arch/rgmp/src/bridge.c +++ b/arch/rgmp/src/bridge.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include "fs.h" #include #include #include diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c index f60bec148f8..e3c93a46822 100644 --- a/fs/fat/fs_configfat.c +++ b/fs/fat/fs_configfat.c @@ -48,7 +48,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" #include "fs_mkfatfs.h" diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c index 8e886f4b620..8379471f7bb 100644 --- a/fs/fat/fs_fat32.c +++ b/fs/fat/fs_fat32.c @@ -63,11 +63,11 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fat/fs_fat32.h b/fs/fat/fs_fat32.h index 8670743ef23..3b3852fe47e 100644 --- a/fs/fat/fs_fat32.h +++ b/fs/fat/fs_fat32.h @@ -52,7 +52,7 @@ #include /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fat/fs_fat32attrib.c b/fs/fat/fs_fat32attrib.c index f58ed81bb2a..a652ee70bd0 100644 --- a/fs/fat/fs_fat32attrib.c +++ b/fs/fat/fs_fat32attrib.c @@ -45,7 +45,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" /**************************************************************************** diff --git a/fs/fat/fs_fat32dirent.c b/fs/fat/fs_fat32dirent.c index b11900d83ca..83368d2d0bc 100644 --- a/fs/fat/fs_fat32dirent.c +++ b/fs/fat/fs_fat32dirent.c @@ -83,11 +83,11 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c index 8b4bf597564..1c570d301d7 100644 --- a/fs/fat/fs_fat32util.c +++ b/fs/fat/fs_fat32util.c @@ -60,11 +60,11 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fat/fs_mkfatfs.c b/fs/fat/fs_mkfatfs.c index 10976abc163..953ad0a364d 100644 --- a/fs/fat/fs_mkfatfs.c +++ b/fs/fat/fs_mkfatfs.c @@ -50,7 +50,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" #include "fs_mkfatfs.h" diff --git a/fs/fat/fs_writefat.c b/fs/fat/fs_writefat.c index 29dce10527f..f32a9d00325 100644 --- a/fs/fat/fs_writefat.c +++ b/fs/fat/fs_writefat.c @@ -48,7 +48,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_fat32.h" #include "fs_mkfatfs.h" diff --git a/fs/fs_internal.h b/fs/fs.h similarity index 85% rename from fs/fs_internal.h rename to fs/fs.h index 5dd45bc2338..a92a802bada 100644 --- a/fs/fs_internal.h +++ b/fs/fs.h @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_internal.h + * fs/fs.h * * Copyright (C) 2007, 2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __FS_FS_INTERNAL_H -#define __FS_FS_INTERNAL_H +#ifndef _FS_FS_H +#define _FS_FS_H /**************************************************************************** * Included Files @@ -52,26 +52,44 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ +/* Inode i_flag values */ -#define FSNODEFLAG_TYPE_MASK 0x00000003 -#define FSNODEFLAG_TYPE_DRIVER 0x00000000 -#define FSNODEFLAG_TYPE_BLOCK 0x00000001 -#define FSNODEFLAG_TYPE_MOUNTPT 0x00000002 -#define FSNODEFLAG_DELETED 0x00000004 +#define FSNODEFLAG_TYPE_MASK 0x00000007 /* Isolates type field */ +#define FSNODEFLAG_TYPE_DRIVER 0x00000000 /* Character driver */ +#define FSNODEFLAG_TYPE_BLOCK 0x00000001 /* Block driver */ +#define FSNODEFLAG_TYPE_MOUNTPT 0x00000002 /* Mount point */ +#define FSNODEFLAG_TYPE_SPECIAL 0x00000004 /* Special OS type */ +#define FSNODEFLAG_TYPE_NAMEDSEM 0x00000004 /* Named semaphore */ +#define FSNODEFLAG_TYPE_MQUEUE 0x00000005 /* Message Queue */ +#define FSNODEFLAG_TYPE_SHM 0x00000006 /* Shared memory region */ +#define FSNODEFLAG_DELETED 0x00000008 /* Unlinked */ -#define INODE_IS_DRIVER(i) \ - (((i)->i_flags & FSNODEFLAG_TYPE_MASK) == FSNODEFLAG_TYPE_DRIVER) -#define INODE_IS_BLOCK(i) \ - (((i)->i_flags & FSNODEFLAG_TYPE_BLOCK) == FSNODEFLAG_TYPE_BLOCK) -#define INODE_IS_MOUNTPT(i) \ - (((i)->i_flags & FSNODEFLAG_TYPE_MOUNTPT) == FSNODEFLAG_TYPE_MOUNTPT) +#define INODE_IS_TYPE(i,t) \ + (((i)->i_flags & FSNODEFLAG_TYPE_MASK) == (t)) +#define INODE_IS_SPECIAL(i) \ + (((i)->i_flags & FSNODEFLAG_TYPE_SPECIAL) != 0) -#define INODE_SET_DRIVER(i) \ - ((i)->i_flags &= ~FSNODEFLAG_TYPE_MASK) -#define INODE_SET_BLOCK(i) \ - ((i)->i_flags = (((i)->i_flags & ~FSNODEFLAG_TYPE_MASK) | FSNODEFLAG_TYPE_BLOCK)) -#define INODE_SET_MOUNTPT(i) \ - ((i)->i_flags = (((i)->i_flags & ~FSNODEFLAG_TYPE_MASK) | FSNODEFLAG_TYPE_MOUNTPT)) +#define INODE_IS_DRIVER(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_DRIVER) +#define INODE_IS_BLOCK(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_BLOCK) +#define INODE_IS_MOUNTPT(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_MOUNTPT) +#define INODE_IS_NAMEDSEM(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_NAMEDSEM) +#define INODE_IS_MQUEUE(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_MQUEUE) +#define INODE_IS_SHM(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_SHM) + +#define INODE_GET_TYPE(i) ((i)->i_flags & FSNODEFLAG_TYPE_MASK) +#define INODE_SET_TYPE(i,t) \ + do \ + { \ + (i)->i_flags = ((i)->i_flags & ~FSNODEFLAG_TYPE_MASK) | (t); \ + } \ + while (0) + +#define INODE_SET_DRIVER(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_DRIVER) +#define INODE_SET_BLOCK(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_BLOCK) +#define INODE_SET_MOUNTPT(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_MOUNTPT) +#define INODE_SET_NAMEDSEM(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_NAMEDSEM) +#define INODE_SET_MQUEUE(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_MQUEUE) +#define INODE_SET_SHM(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_SHM) /* Mountpoint fd_flags values */ @@ -343,4 +361,4 @@ int find_blockdriver(FAR const char *pathname, int mountflags, } #endif -#endif /* __FS_FS_INTERNAL_H */ +#endif /* _FS_FS_H */ diff --git a/fs/fs_automount.c b/fs/fs_automount.c index 2dc9a9b7a8c..c15e9238684 100644 --- a/fs/fs_automount.c +++ b/fs/fs_automount.c @@ -55,7 +55,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_close.c b/fs/fs_close.c index 7f08995dee1..5845feb3d6f 100644 --- a/fs/fs_close.c +++ b/fs/fs_close.c @@ -48,7 +48,7 @@ # include #endif -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Global Functions diff --git a/fs/fs_closeblockdriver.c b/fs/fs_closeblockdriver.c index 5abccd82e04..cc0e3e2bfd3 100644 --- a/fs/fs_closeblockdriver.c +++ b/fs/fs_closeblockdriver.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_closedir.c b/fs/fs_closedir.c index 353b1a447e7..65c845a1a3e 100644 --- a/fs/fs_closedir.c +++ b/fs/fs_closedir.c @@ -46,7 +46,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_dup.c b/fs/fs_dup.c index 1cb1b167441..a6467a3afeb 100644 --- a/fs/fs_dup.c +++ b/fs/fs_dup.c @@ -44,7 +44,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_dup2.c b/fs/fs_dup2.c index 14171fe473c..e6b74a3bab2 100644 --- a/fs/fs_dup2.c +++ b/fs/fs_dup2.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /* This logic in this applies only when both socket and file descriptors are * in that case, this function descriminates which type of dup2 is being diff --git a/fs/fs_fcntl.c b/fs/fs_fcntl.c index 1ac9f070a12..b962960da4a 100644 --- a/fs/fs_fcntl.c +++ b/fs/fs_fcntl.c @@ -48,7 +48,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_filedup.c b/fs/fs_filedup.c index 53cdc1b0aea..c291c2f0fd1 100644 --- a/fs/fs_filedup.c +++ b/fs/fs_filedup.c @@ -45,7 +45,7 @@ #include -#include "fs_internal.h" +#include "fs.h" #if CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/fs/fs_filedup2.c b/fs/fs_filedup2.c index 7b94cb569bc..fd6799dacb5 100644 --- a/fs/fs_filedup2.c +++ b/fs/fs_filedup2.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #if CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/fs/fs_files.c b/fs/fs_files.c index aff33d2bc26..d9db965c792 100644 --- a/fs/fs_files.c +++ b/fs/fs_files.c @@ -49,7 +49,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_findblockdriver.c b/fs/fs_findblockdriver.c index 5c20d46a949..afc1bb2b827 100644 --- a/fs/fs_findblockdriver.c +++ b/fs/fs_findblockdriver.c @@ -44,7 +44,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_foreachinode.c b/fs/fs_foreachinode.c index 8066aabe60d..06412d6eacf 100644 --- a/fs/fs_foreachinode.c +++ b/fs/fs_foreachinode.c @@ -47,7 +47,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_foreachmountpoint.c b/fs/fs_foreachmountpoint.c index 74e3e8356a0..6df68bd75ac 100644 --- a/fs/fs_foreachmountpoint.c +++ b/fs/fs_foreachmountpoint.c @@ -49,7 +49,7 @@ #include -#include "fs_internal.h" +#include "fs.h" #ifndef CONFIG_DISABLE_MOUNTPOUNT diff --git a/fs/fs_fsync.c b/fs/fs_fsync.c index 49104ed0222..5073c7f7f98 100644 --- a/fs/fs_fsync.c +++ b/fs/fs_fsync.c @@ -47,7 +47,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_inode.c b/fs/fs_inode.c index 6d2b741ea32..3eb89ab4f78 100644 --- a/fs/fs_inode.c +++ b/fs/fs_inode.c @@ -46,7 +46,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_inodeaddref.c b/fs/fs_inodeaddref.c index ebe6b488817..b5c14e0b06a 100644 --- a/fs/fs_inodeaddref.c +++ b/fs/fs_inodeaddref.c @@ -41,7 +41,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_inodebasename.c b/fs/fs_inodebasename.c index 76d8a8e2013..4fa78e028fc 100644 --- a/fs/fs_inodebasename.c +++ b/fs/fs_inodebasename.c @@ -39,7 +39,7 @@ #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_inodefind.c b/fs/fs_inodefind.c index 90553936614..88f34c87de9 100644 --- a/fs/fs_inodefind.c +++ b/fs/fs_inodefind.c @@ -42,7 +42,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_inoderelease.c b/fs/fs_inoderelease.c index 0040426d61b..5fef133deb7 100644 --- a/fs/fs_inoderelease.c +++ b/fs/fs_inoderelease.c @@ -44,7 +44,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_inoderemove.c b/fs/fs_inoderemove.c index 3466d895230..9cc6e0907cd 100644 --- a/fs/fs_inoderemove.c +++ b/fs/fs_inoderemove.c @@ -44,10 +44,10 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fs_inodereserve.c b/fs/fs_inodereserve.c index 2c13513a435..72d2ff0311f 100644 --- a/fs/fs_inodereserve.c +++ b/fs/fs_inodereserve.c @@ -45,7 +45,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_ioctl.c b/fs/fs_ioctl.c index 89b7b3f51e9..2ccda792ffb 100644 --- a/fs/fs_ioctl.c +++ b/fs/fs_ioctl.c @@ -50,7 +50,7 @@ # include #endif -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Global Functions diff --git a/fs/fs_lseek.c b/fs/fs_lseek.c index c594610529e..eb05c5615f4 100644 --- a/fs/fs_lseek.c +++ b/fs/fs_lseek.c @@ -45,7 +45,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #if CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/fs/fs_mkdir.c b/fs/fs_mkdir.c index 74d5e04f622..5f13b9183b4 100644 --- a/fs/fs_mkdir.c +++ b/fs/fs_mkdir.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_mount.c b/fs/fs_mount.c index 8b6d80f2b4f..8e80ad103ef 100644 --- a/fs/fs_mount.c +++ b/fs/fs_mount.c @@ -47,7 +47,7 @@ #include -#include "fs_internal.h" +#include "fs.h" /* At least one filesystem must be defined, or this file will not compile. * It may be desire-able to make filesystems dynamically registered at diff --git a/fs/fs_open.c b/fs/fs_open.c index aead99f8fc6..5d73e71878e 100644 --- a/fs/fs_open.c +++ b/fs/fs_open.c @@ -50,7 +50,7 @@ #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_openblockdriver.c b/fs/fs_openblockdriver.c index c59a255b003..5bd7b1a6fc6 100644 --- a/fs/fs_openblockdriver.c +++ b/fs/fs_openblockdriver.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_opendir.c b/fs/fs_opendir.c index 637b4253f94..865c644b9e6 100644 --- a/fs/fs_opendir.c +++ b/fs/fs_opendir.c @@ -49,7 +49,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_poll.c b/fs/fs_poll.c index 6396cdf8e5a..9a7f84b46cb 100644 --- a/fs/fs_poll.c +++ b/fs/fs_poll.c @@ -52,7 +52,7 @@ #include -#include "fs_internal.h" +#include "fs.h" #ifndef CONFIG_DISABLE_POLL diff --git a/fs/fs_read.c b/fs/fs_read.c index 5a7e6cb1842..1e7bc510630 100644 --- a/fs/fs_read.c +++ b/fs/fs_read.c @@ -46,7 +46,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_readdir.c b/fs/fs_readdir.c index 11e23d9b171..eba40109ec9 100644 --- a/fs/fs_readdir.c +++ b/fs/fs_readdir.c @@ -46,7 +46,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_registerblockdriver.c b/fs/fs_registerblockdriver.c index bb5a3121b0e..d55407ff8d9 100644 --- a/fs/fs_registerblockdriver.c +++ b/fs/fs_registerblockdriver.c @@ -44,10 +44,10 @@ #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** - * Definitions + * Pre-processor oDefinitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fs_registerdriver.c b/fs/fs_registerdriver.c index cc1759ee72c..db2aa617d5f 100644 --- a/fs/fs_registerdriver.c +++ b/fs/fs_registerdriver.c @@ -44,10 +44,10 @@ #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/fs_rename.c b/fs/fs_rename.c index 38da25b9705..4a563c33935 100644 --- a/fs/fs_rename.c +++ b/fs/fs_rename.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_rewinddir.c b/fs/fs_rewinddir.c index 879b66363d0..c6bb295cbb4 100644 --- a/fs/fs_rewinddir.c +++ b/fs/fs_rewinddir.c @@ -45,7 +45,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_rmdir.c b/fs/fs_rmdir.c index 14f32500974..407aa58a052 100644 --- a/fs/fs_rmdir.c +++ b/fs/fs_rmdir.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_seekdir.c b/fs/fs_seekdir.c index c49acef575f..9ad7460ccd5 100644 --- a/fs/fs_seekdir.c +++ b/fs/fs_seekdir.c @@ -46,7 +46,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_select.c b/fs/fs_select.c index f862ade33c7..3f05d42be31 100644 --- a/fs/fs_select.c +++ b/fs/fs_select.c @@ -51,7 +51,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #ifndef CONFIG_DISABLE_POLL diff --git a/fs/fs_stat.c b/fs/fs_stat.c index 109074dc65d..416e360c1a7 100644 --- a/fs/fs_stat.c +++ b/fs/fs_stat.c @@ -44,7 +44,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_statfs.c b/fs/fs_statfs.c index df7321bbd7f..e19fe7a9192 100644 --- a/fs/fs_statfs.c +++ b/fs/fs_statfs.c @@ -45,7 +45,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/fs_syslog.c b/fs/fs_syslog.c index f17a1b0d61b..053720747d0 100644 --- a/fs/fs_syslog.c +++ b/fs/fs_syslog.c @@ -53,7 +53,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #if defined(CONFIG_SYSLOG) && defined(CONFIG_SYSLOG_CHAR) diff --git a/fs/fs_umount.c b/fs/fs_umount.c index b485e9e68dd..2100b258650 100644 --- a/fs/fs_umount.c +++ b/fs/fs_umount.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_unlink.c b/fs/fs_unlink.c index c17bed7136f..9ba1748ba89 100644 --- a/fs/fs_unlink.c +++ b/fs/fs_unlink.c @@ -43,7 +43,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_unregisterblockdriver.c b/fs/fs_unregisterblockdriver.c index 4d169fddfa3..20652546178 100644 --- a/fs/fs_unregisterblockdriver.c +++ b/fs/fs_unregisterblockdriver.c @@ -41,7 +41,7 @@ #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_unregisterdriver.c b/fs/fs_unregisterdriver.c index c9ac0b6192d..ffd28738310 100644 --- a/fs/fs_unregisterdriver.c +++ b/fs/fs_unregisterdriver.c @@ -41,7 +41,7 @@ #include -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs_write.c b/fs/fs_write.c index 3aad823a8e9..070960c3dcd 100644 --- a/fs/fs_write.c +++ b/fs/fs_write.c @@ -49,7 +49,7 @@ # include #endif -#include "fs_internal.h" +#include "fs.h" /**************************************************************************** * Private Functions diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c index 749f332bc7e..cdce64bef3a 100644 --- a/fs/mmap/fs_mmap.c +++ b/fs/mmap/fs_mmap.c @@ -46,7 +46,7 @@ #include #include -#include "fs_internal.h" +#include "fs.h" #include "fs_rammap.h" /**************************************************************************** diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c index df38bd14d0d..04ed13323e0 100644 --- a/fs/mmap/fs_munmap.c +++ b/fs/mmap/fs_munmap.c @@ -49,7 +49,7 @@ #include -#include "fs_internal.h" +#include "fs.h" #include "fs_rammap.h" #ifdef CONFIG_FS_RAMMAP diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c index 04e08fb66ba..c8b2d0eca5b 100644 --- a/fs/mmap/fs_rammap.c +++ b/fs/mmap/fs_rammap.c @@ -49,7 +49,7 @@ #include -#include "fs_internal.h" +#include "fs.h" #include "fs_rammap.h" #ifdef CONFIG_FS_RAMMAP diff --git a/fs/romfs/fs_romfs.h b/fs/romfs/fs_romfs.h index 6a337d2c5c8..e3ec51a00eb 100644 --- a/fs/romfs/fs_romfs.h +++ b/fs/romfs/fs_romfs.h @@ -49,10 +49,10 @@ #include -#include "../fs_internal.h" +#include "../fs.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Volume header (multi-byte values are big-endian) */ diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c index f221b49f670..bcbda7de8e3 100644 --- a/fs/smartfs/smartfs_smart.c +++ b/fs/smartfs/smartfs_smart.c @@ -63,7 +63,7 @@ #include "smartfs.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/fs/smartfs/smartfs_utils.c b/fs/smartfs/smartfs_utils.c index 6bbd953bd75..a7bb21e8e74 100644 --- a/fs/smartfs/smartfs_utils.c +++ b/fs/smartfs/smartfs_utils.c @@ -57,7 +57,7 @@ #include "smartfs.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /****************************************************************************