Move file-system header files to include/nuttx/fs

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4499 42af7a65-404d-4744-a932-0658087f49c3

ChangeLog

@@ -2579,3 +2579,5 @@
 	  the USB device driver can used the the mass storage class (which does a LOT
 	  of stalling as part of its normal protocol).  The PIC32 USB Mass Storage
 	  device is, however, still non-functional when debug is OFF.
+	* include/nuttx/fs: Move all file-system related files from include/nuttx to
+	  include/nuttx/fs.

Documentation/NuttShell.html

@@ -1321,7 +1321,7 @@ mkfatfs <path>
   Format a fat file system on the block device specified by <code>&lt;path&gt;</code>.
   NSH provides this command to access the <a href="mkfatfs"><code>mkfatfs()</code></a> NuttX API.
   This block device must reside in the NuttX <a href="NuttxUserGuide.html#FileSystemOverview"><i>pseudo</i> filesystem</a> and
-  must have been created by some call to <code>register_blockdriver()</code> (see <code>include/nuttx/fs.h</code>).
+  must have been created by some call to <code>register_blockdriver()</code> (see <code>include/nuttx/fs/fs.h</code>).
 </p>
 
 <table width ="100%">

Documentation/NuttxPortingGuide.html

@@ -2307,7 +2307,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/nuttx/fs.h</code></b>.
+    <b><code>include/nuttx/fs/fs.h</code></b>.
     All structures and APIs needed to work with character drivers are provided in this header file.
     </p>
   </li>
@@ -2359,7 +2359,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/nuttx/fs.h</code></b>.
+    <b><code>include/nuttx/fs/fs.h</code></b>.
     All structures and APIs needed to work with block drivers are provided in this header file.
     </p>
   </li>
@@ -2797,7 +2797,7 @@ extern void up_ledoff(int led);
       <li><code>MTDIOC_BULKERASE</code>: Erase the entire device</li>
     </ul>
     <p>
-      is provided via a sinble <code>ioctl</code> method (see <code>include/nuttx/ioctl.h</code>):
+      is provided via a sinble <code>ioctl</code> method (see <code>include/nuttx/fs/ioctl.h</code>):
     </p>
     <ul>
      <p><code>int (*ioctl)(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg);</code></p>
@@ -3827,12 +3827,12 @@ build
   </li>
   <li>
     <code>CONFIG_NUTTX_KERNEL</code>:
-      With most MCUs, NuttX is built as a flat, single executable image
+      With most MCUs, NuttX is built as a flat, single executable image
       containing the NuttX RTOS along with all application code.
       The RTOS code and the application run in the same address space and at the same kernel-mode privileges.
-      If this option is selected, NuttX will be built separately as a monolithic, kernel-mode module and the applications
+      If this option is selected, NuttX will be built separately as a monolithic, kernel-mode module and the applications
       can be added as a separately built, user-mode module.
-      In this a system call layer will be built to support the user- to kernel-mode interface to the RTOS.
+      In this a system call layer will be built to support the user- to kernel-mode interface to the RTOS.
   </li>
   <li>
     <code>CONFIG_MM_REGIONS</code>: If the architecture includes multiple

Documentation/NuttxUserGuide.html

@@ -6623,7 +6623,7 @@ void  *memmove(void *dest, const void *src, size_t count);
   <b>Function Prototype:</b>
 </p>
 <ul><pre>
-#include &lt;nuttx/mkfatfs.h&gt;
+#include &lt;nuttx/fs/mkfatfs.h&gt;
 int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt);
 </pre></ul>
 <p>

arch/8051/src/up_initialize.c

@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "up_internal.h"
 

arch/arm/include/serial.h

@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <sys/types.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions

arch/arm/include/watchdog.h

@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions

arch/arm/src/c5471/c5471_watchdog.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
 #include <arch/watchdog.h>
 

arch/arm/src/common/up_exit.c

@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/arm/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>

arch/avr/src/common/up_exit.c

@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/avr/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>

arch/hc/src/common/up_exit.c

@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/hc/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include "up_arch.h"

arch/mips/src/common/up_exit.c

@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/mips/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>

arch/rgmp/src/bridge.c

@@ -39,7 +39,7 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <fs_internal.h>
 #include <queue.h>

arch/sh/include/serial.h

@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions

arch/sh/src/common/up_exit.c

@@ -48,7 +48,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/sh/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include "up_arch.h"

arch/sim/src/up_devconsole.c

@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "up_internal.h"
 

arch/sim/src/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include "up_internal.h"

arch/sim/src/up_touchscreen.c

@@ -54,7 +54,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include <nuttx/input/touchscreen.h>
 

arch/x86/src/common/up_exit.c

@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/x86/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>

arch/z16/src/common/up_exit.c

@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/z16/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/mm.h>
 #include <nuttx/ramlog.h>
 

arch/z80/include/serial.h

@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions

arch/z80/src/common/up_exit.c

@@ -50,7 +50,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************

arch/z80/src/common/up_initialize.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/mm.h>
 #include <arch/board/board.h>
 

configs/ea3131/src/up_fillpage.c

@@ -64,7 +64,7 @@
 
 #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB)
 #  include <sys/ioctl.h>
-#  include <nuttx/ioctl.h>
+#  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi.h>
 #  include <nuttx/mtd.h>
 #endif

configs/ea3131/src/up_usbmsc.c

@@ -46,8 +46,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/mkfatfs.h>
 #include <nuttx/ramdisk.h>
 
 /****************************************************************************

configs/ea3152/src/up_fillpage.c

@@ -64,7 +64,7 @@
 
 #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB)
 #  include <sys/ioctl.h>
-#  include <nuttx/ioctl.h>
+#  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi.h>
 #  include <nuttx/mtd.h>
 #endif

configs/ea3152/src/up_usbmsc.c

@@ -46,8 +46,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/mkfatfs.h>
 #include <nuttx/ramdisk.h>
 
 /****************************************************************************

configs/vsn/src/sif.c

@@ -69,7 +69,7 @@
  **/
 
 #include <nuttx/config.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <semaphore.h>
 #include <nuttx/clock.h>
 #include <nuttx/time.h>

drivers/README.txt

@@ -17,14 +17,14 @@ can.c
 
 dev_null.c and dev_zero.c
 	These files provide the standard /dev/null and /dev/zero devices.
- 	See include/nuttx/fs.h for functions that should be called if you
+ 	See include/nuttx/fs/fs.h for functions that should be called if you
 	want to register these devices (devnull_register() and
 	devzero_register()).
 
 loop.c
 	Supports the standard loop device that can be used to export a
 	file (or character device) as a block device.  See losetup() and
-	loteardown() in	include/nuttx/fs.h.
+	loteardown() in	include/nuttx/fs/fs.h.
 
 ramdisk.c
 	Can be used to set up a block of memory or (read-only) FLASH as
@@ -60,7 +60,7 @@ analog/
 bch/
 	Contains logic that may be used to convert a block driver into
 	a character driver.  This is the complementary conversion as that
-	performed by loop.c.  See include/nuttx/fs.h for registration
+	performed by loop.c.  See include/nuttx/fs/fs.h for registration
 	information.
 
 analog/

drivers/analog/adc.c

@@ -55,7 +55,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/analog/adc.h>
 

drivers/analog/dac.c

@@ -55,7 +55,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/analog/dac.h>
 

drivers/bch/bch_internal.h

@@ -46,7 +46,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <semaphore.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 /****************************************************************************
  * Pre-processor Definitions

drivers/bch/bchdev_driver.c

@@ -55,8 +55,8 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
 
 #include "bch_internal.h"
 

drivers/bch/bchdev_unregister.c

@@ -49,8 +49,8 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
 
 #include "bch_internal.h"
 

drivers/bch/bchlib_cache.c

@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "bch_internal.h"
 

drivers/bch/bchlib_read.c

@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "bch_internal.h"
 

drivers/bch/bchlib_setup.c

@@ -50,7 +50,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "bch_internal.h"
 

drivers/bch/bchlib_teardown.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "bch_internal.h"
 

drivers/bch/bchlib_write.c

@@ -47,7 +47,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "bch_internal.h"
 

drivers/can.c

@@ -50,7 +50,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/can.h>
 

drivers/dev_null.c

@@ -44,7 +44,7 @@
 #include <string.h>
 #include <poll.h>
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 /****************************************************************************
  * Private Function Prototypes

drivers/dev_zero.c

@@ -44,7 +44,7 @@
 #include <string.h>
 #include <poll.h>
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 /****************************************************************************
  * Private Function Prototypes

drivers/input/ads7843e.c

@@ -60,7 +60,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/spi.h>
 #include <nuttx/wqueue.h>
 

drivers/input/tsc2007.c

@@ -64,7 +64,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/i2c.h>
 #include <nuttx/wqueue.h>
 

drivers/loop.c

@@ -57,7 +57,7 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 /****************************************************************************
  * Pre-processor Definitions

drivers/mmcsd/mmcsd_sdio.c

@@ -54,8 +54,8 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/clock.h>
 #include <nuttx/arch.h>
 #include <nuttx/rwbuffer.h>

drivers/mmcsd/mmcsd_spi.c

@@ -51,7 +51,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/spi.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/mmcsd.h>
 
 #include "mmcsd_spi.h"

drivers/mtd/at24xx.c

@@ -58,7 +58,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/i2c.h>
 #include <nuttx/mtd.h>
 

drivers/mtd/at45db.c

@@ -61,7 +61,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/spi.h>
 #include <nuttx/mtd.h>
 

drivers/mtd/flash_eraseall.c

@@ -42,8 +42,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd.h>
 
 /****************************************************************************

drivers/mtd/ftl.c

@@ -50,8 +50,8 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd.h>
 #include <nuttx/rwbuffer.h>
 

drivers/mtd/m25px.c

@@ -49,7 +49,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/spi.h>
 #include <nuttx/mtd.h>
 

drivers/mtd/rammtd.c

@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd.h>
 
 /****************************************************************************

drivers/mtd/ramtron.c

@@ -67,7 +67,7 @@
 #include <assert.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/spi.h>
 #include <nuttx/mtd.h>
 

drivers/mtd/skeleton.c

@@ -43,7 +43,7 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd.h>
 
 /****************************************************************************

drivers/pipes/fifo.c

@@ -41,7 +41,7 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <errno.h>
 
 #include "pipe_common.h"

drivers/pipes/pipe.c

@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <semaphore.h>

drivers/pipes/pipe_common.c

@@ -53,7 +53,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #if CONFIG_DEBUG
 #  include <nuttx/arch.h>
 #endif

drivers/power/battery.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/power/battery.h>
 
 /* This driver requires:

drivers/pwm.c

@@ -55,7 +55,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/pwm.h>
 

drivers/ramdisk.c

@@ -50,7 +50,7 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramdisk.h>
 
 /****************************************************************************

drivers/ramlog.c

@@ -52,9 +52,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/ramlog.h>
 

drivers/sensors/lm75.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/i2c.h>
 #include <nuttx/sensors/lm75.h>
 

drivers/sensors/qencoder.c

@@ -55,7 +55,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/sensors/qencoder.h>
 

drivers/serial/lowconsole.c

@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 /****************************************************************************
  * Definitions

drivers/serial/serial.c

@@ -52,7 +52,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/serial.h>
 
 /************************************************************************************

drivers/serial/uart_16550.c

@@ -52,7 +52,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/serial.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 #include <nuttx/uart_16550.h>
 
 #include <arch/board/board.h>

drivers/usbdev/usbmsc.c

@@ -74,7 +74,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/storage.h>
 #include <nuttx/usb/usbdev.h>

drivers/usbdev/usbmsc.h

@@ -50,7 +50,7 @@
 #include <pthread.h>
 #include <queue.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/usb/storage.h>
 #include <nuttx/usb/usbdev.h>
 
@@ -424,7 +424,7 @@ enum usbmsc_epdesc_e
 
 struct usbmsc_req_s
 {
-  FAR struct usbmsc_req_s *flink;    /* Implements a singly linked list */
+  FAR struct usbmsc_req_s *flink;     /* Implements a singly linked list */
   FAR struct usbdev_req_s *req;       /* The contained request */
 };
 

drivers/usbhost/usbhost_hidkbd.c

@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 

drivers/usbhost/usbhost_skeleton.c

@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 

drivers/usbhost/usbhost_storage.c

@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/scsi.h>

fs/fat/fs_configfat.c

@@ -44,9 +44,9 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/mkfatfs.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fat/fs_fat32.c

@@ -59,9 +59,9 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/dirent.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fat/fs_fat32.h

@@ -48,7 +48,7 @@
 #include <semaphore.h>
 #include <time.h>
 
-#include <nuttx/dirent.h>
+#include <nuttx/fs/dirent.h>
 
 /****************************************************************************
  * Definitions

fs/fat/fs_fat32attrib.c

@@ -42,8 +42,8 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fat/fs_fat32dirent.c

@@ -80,8 +80,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fat/fs_fat32util.c

@@ -57,8 +57,8 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fat/fs_mkfatfs.c

@@ -45,9 +45,9 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/mkfatfs.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fat/fs_writefat.c

@@ -44,9 +44,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/mkfatfs.h>
 
 #include "fs_internal.h"
 #include "fs_fat32.h"

fs/fs_close.c

@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
 # include <nuttx/net/net.h>

fs/fs_closeblockdriver.c

@@ -41,7 +41,7 @@
 
 #include <debug.h>
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "fs_internal.h"
 

fs/fs_closedir.c

@@ -43,8 +43,8 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/dirent.h>
 
 #include "fs_internal.h"
 

fs/fs_dup.c

@@ -43,7 +43,7 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include "fs_internal.h"
 
 /****************************************************************************

fs/fs_fcntl.c

@@ -43,7 +43,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
 #include <nuttx/sched.h>
 

fs/fs_fdopen.c

@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
 
 /****************************************************************************

fs/fs_filedup.c

@@ -42,7 +42,7 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "fs_internal.h"
 

fs/fs_files.c

@@ -46,7 +46,7 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 
 #include "fs_internal.h"

fs/fs_findblockdriver.c

@@ -42,7 +42,7 @@
 #include <sys/mount.h>
 #include <debug.h>
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "fs_internal.h"
 

fs/fs_fsync.c

@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/sched.h>
 
 #include "fs_internal.h"

fs/fs_inode.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "fs_internal.h"
 

fs/fs_inodeaddref.c

@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include "fs_internal.h"
 
 /****************************************************************************