diff options
Diffstat (limited to 'nuttx')
182 files changed, 252 insertions, 250 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 229326e99..b923409c3 100644 --- a/nuttx/ChangeLog +++ b/nuttx/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. diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html index 2d8b4722d..ea851026d 100644 --- a/nuttx/Documentation/NuttShell.html +++ b/nuttx/Documentation/NuttShell.html @@ -1321,7 +1321,7 @@ mkfatfs <path> Format a fat file system on the block device specified by <code><path></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%"> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index e92025862..8550d98fc 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/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 diff --git a/nuttx/Documentation/NuttxUserGuide.html b/nuttx/Documentation/NuttxUserGuide.html index 614570aa9..262f237a9 100644 --- a/nuttx/Documentation/NuttxUserGuide.html +++ b/nuttx/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 <nuttx/mkfatfs.h> +#include <nuttx/fs/mkfatfs.h> int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt); </pre></ul> <p> diff --git a/nuttx/arch/8051/src/up_initialize.c b/nuttx/arch/8051/src/up_initialize.c index 4252dd617..8e7492147 100644 --- a/nuttx/arch/8051/src/up_initialize.c +++ b/nuttx/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" diff --git a/nuttx/arch/arm/include/serial.h b/nuttx/arch/arm/include/serial.h index d539d2733..80eefb2b4 100644 --- a/nuttx/arch/arm/include/serial.h +++ b/nuttx/arch/arm/include/serial.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include <sys/types.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /**************************************************************************** * Definitions diff --git a/nuttx/arch/arm/include/watchdog.h b/nuttx/arch/arm/include/watchdog.h index 263795eb3..f70b8d2e9 100644 --- a/nuttx/arch/arm/include/watchdog.h +++ b/nuttx/arch/arm/include/watchdog.h @@ -40,7 +40,7 @@ * Included Files ****************************************************************************/ -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /**************************************************************************** * Definitions diff --git a/nuttx/arch/arm/src/c5471/c5471_watchdog.c b/nuttx/arch/arm/src/c5471/c5471_watchdog.c index 164cbbe23..20b5be97c 100644 --- a/nuttx/arch/arm/src/c5471/c5471_watchdog.c +++ b/nuttx/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> diff --git a/nuttx/arch/arm/src/common/up_exit.c b/nuttx/arch/arm/src/common/up_exit.c index 926d21509..6f6d54f76 100644 --- a/nuttx/arch/arm/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c index 8bf530fda..20c23ef67 100644 --- a/nuttx/arch/arm/src/common/up_initialize.c +++ b/nuttx/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> diff --git a/nuttx/arch/avr/src/common/up_exit.c b/nuttx/arch/avr/src/common/up_exit.c index d7104c5da..1c41b7496 100644 --- a/nuttx/arch/avr/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c index 58d243ee5..3b86fd058 100644 --- a/nuttx/arch/avr/src/common/up_initialize.c +++ b/nuttx/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> diff --git a/nuttx/arch/hc/src/common/up_exit.c b/nuttx/arch/hc/src/common/up_exit.c index 77c627b4a..5b85ffe68 100644 --- a/nuttx/arch/hc/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c index 5481ed7bc..a2cf078e9 100755 --- a/nuttx/arch/hc/src/common/up_initialize.c +++ b/nuttx/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" diff --git a/nuttx/arch/mips/src/common/up_exit.c b/nuttx/arch/mips/src/common/up_exit.c index f82b47330..876b486b6 100644 --- a/nuttx/arch/mips/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c index 11bd979f0..fa8e5cf5d 100644 --- a/nuttx/arch/mips/src/common/up_initialize.c +++ b/nuttx/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> diff --git a/nuttx/arch/rgmp/src/bridge.c b/nuttx/arch/rgmp/src/bridge.c index 7dcaf90f1..96280a7bf 100644 --- a/nuttx/arch/rgmp/src/bridge.c +++ b/nuttx/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> diff --git a/nuttx/arch/sh/include/serial.h b/nuttx/arch/sh/include/serial.h index 5cb942c1c..09073e144 100644 --- a/nuttx/arch/sh/include/serial.h +++ b/nuttx/arch/sh/include/serial.h @@ -40,7 +40,7 @@ * Included Files ****************************************************************************/ -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /**************************************************************************** * Definitions diff --git a/nuttx/arch/sh/src/common/up_exit.c b/nuttx/arch/sh/src/common/up_exit.c index 29213ce9d..fc1991db1 100644 --- a/nuttx/arch/sh/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c index 837b218a0..ffdfbb4ee 100644 --- a/nuttx/arch/sh/src/common/up_initialize.c +++ b/nuttx/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" diff --git a/nuttx/arch/sim/src/up_devconsole.c b/nuttx/arch/sim/src/up_devconsole.c index afc0c0481..a2406f232 100644 --- a/nuttx/arch/sim/src/up_devconsole.c +++ b/nuttx/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" diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c index 66fb11b9a..3e2f06958 100644 --- a/nuttx/arch/sim/src/up_initialize.c +++ b/nuttx/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" diff --git a/nuttx/arch/sim/src/up_touchscreen.c b/nuttx/arch/sim/src/up_touchscreen.c index 55f060d3f..f89371cbf 100644 --- a/nuttx/arch/sim/src/up_touchscreen.c +++ b/nuttx/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> diff --git a/nuttx/arch/x86/src/common/up_exit.c b/nuttx/arch/x86/src/common/up_exit.c index ceca72c87..840464da1 100644 --- a/nuttx/arch/x86/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c index eb0cdccc1..f58fd00a6 100644 --- a/nuttx/arch/x86/src/common/up_initialize.c +++ b/nuttx/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> diff --git a/nuttx/arch/z16/src/common/up_exit.c b/nuttx/arch/z16/src/common/up_exit.c index 512dcd747..be5411b1f 100644 --- a/nuttx/arch/z16/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c index 165f0ead3..968e8e8f0 100644 --- a/nuttx/arch/z16/src/common/up_initialize.c +++ b/nuttx/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> diff --git a/nuttx/arch/z80/include/serial.h b/nuttx/arch/z80/include/serial.h index 0a54e5849..91a0184c4 100644 --- a/nuttx/arch/z80/include/serial.h +++ b/nuttx/arch/z80/include/serial.h @@ -40,7 +40,7 @@ * Included Files ****************************************************************************/ -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /**************************************************************************** * Definitions diff --git a/nuttx/arch/z80/src/common/up_exit.c b/nuttx/arch/z80/src/common/up_exit.c index da49ce377..f57fd442c 100644 --- a/nuttx/arch/z80/src/common/up_exit.c +++ b/nuttx/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 /**************************************************************************** diff --git a/nuttx/arch/z80/src/common/up_initialize.c b/nuttx/arch/z80/src/common/up_initialize.c index a4659a2e9..1ae927831 100644 --- a/nuttx/arch/z80/src/common/up_initialize.c +++ b/nuttx/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> diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c index 531675aa0..356ea599a 100644 --- a/nuttx/configs/ea3131/src/up_fillpage.c +++ b/nuttx/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 diff --git a/nuttx/configs/ea3131/src/up_usbmsc.c b/nuttx/configs/ea3131/src/up_usbmsc.c index 422ff3603..b1d07ac55 100644 --- a/nuttx/configs/ea3131/src/up_usbmsc.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c index d1de9a699..019dd940c 100644 --- a/nuttx/configs/ea3152/src/up_fillpage.c +++ b/nuttx/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 diff --git a/nuttx/configs/ea3152/src/up_usbmsc.c b/nuttx/configs/ea3152/src/up_usbmsc.c index db92e5b9e..2c3356b4e 100644 --- a/nuttx/configs/ea3152/src/up_usbmsc.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb b/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb Binary files differindex 5a4c7145c..935e97e45 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb +++ b/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb diff --git a/nuttx/configs/vsn/src/sif.c b/nuttx/configs/vsn/src/sif.c index e185d8d0d..0269ebcab 100644 --- a/nuttx/configs/vsn/src/sif.c +++ b/nuttx/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> diff --git a/nuttx/drivers/README.txt b/nuttx/drivers/README.txt index 9bde312f4..584edc4dd 100644 --- a/nuttx/drivers/README.txt +++ b/nuttx/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/ diff --git a/nuttx/drivers/analog/adc.c b/nuttx/drivers/analog/adc.c index 8ba84116f..84070f162 100644 --- a/nuttx/drivers/analog/adc.c +++ b/nuttx/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> diff --git a/nuttx/drivers/analog/dac.c b/nuttx/drivers/analog/dac.c index b283a5bf5..9371e3414 100644 --- a/nuttx/drivers/analog/dac.c +++ b/nuttx/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> diff --git a/nuttx/drivers/bch/bch_internal.h b/nuttx/drivers/bch/bch_internal.h index c24eeebbd..ffda8151e 100644 --- a/nuttx/drivers/bch/bch_internal.h +++ b/nuttx/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 diff --git a/nuttx/drivers/bch/bchdev_driver.c b/nuttx/drivers/bch/bchdev_driver.c index c57a5cd31..c80701449 100644 --- a/nuttx/drivers/bch/bchdev_driver.c +++ b/nuttx/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" diff --git a/nuttx/drivers/bch/bchdev_unregister.c b/nuttx/drivers/bch/bchdev_unregister.c index c54b5b005..0532ff4aa 100644 --- a/nuttx/drivers/bch/bchdev_unregister.c +++ b/nuttx/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" diff --git a/nuttx/drivers/bch/bchlib_cache.c b/nuttx/drivers/bch/bchlib_cache.c index 3e2887c94..e7eca9bff 100644 --- a/nuttx/drivers/bch/bchlib_cache.c +++ b/nuttx/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" diff --git a/nuttx/drivers/bch/bchlib_read.c b/nuttx/drivers/bch/bchlib_read.c index e146f02f8..0f880ab2a 100644 --- a/nuttx/drivers/bch/bchlib_read.c +++ b/nuttx/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" diff --git a/nuttx/drivers/bch/bchlib_setup.c b/nuttx/drivers/bch/bchlib_setup.c index b97b63dd2..00a2eada8 100644 --- a/nuttx/drivers/bch/bchlib_setup.c +++ b/nuttx/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" diff --git a/nuttx/drivers/bch/bchlib_teardown.c b/nuttx/drivers/bch/bchlib_teardown.c index e2084125c..a0c659252 100644 --- a/nuttx/drivers/bch/bchlib_teardown.c +++ b/nuttx/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" diff --git a/nuttx/drivers/bch/bchlib_write.c b/nuttx/drivers/bch/bchlib_write.c index 956f1619f..fcba9ede8 100644 --- a/nuttx/drivers/bch/bchlib_write.c +++ b/nuttx/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" diff --git a/nuttx/drivers/can.c b/nuttx/drivers/can.c index 3c9ea28fc..2c1567781 100644 --- a/nuttx/drivers/can.c +++ b/nuttx/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> diff --git a/nuttx/drivers/dev_null.c b/nuttx/drivers/dev_null.c index f473f1b87..c2b523bcb 100644 --- a/nuttx/drivers/dev_null.c +++ b/nuttx/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 diff --git a/nuttx/drivers/dev_zero.c b/nuttx/drivers/dev_zero.c index c4b453798..23a2078f5 100644 --- a/nuttx/drivers/dev_zero.c +++ b/nuttx/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 diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c index 52d871dd5..ed42e2275 100644 --- a/nuttx/drivers/input/ads7843e.c +++ b/nuttx/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> diff --git a/nuttx/drivers/input/tsc2007.c b/nuttx/drivers/input/tsc2007.c index 52f8652a7..dcf743821 100644 --- a/nuttx/drivers/input/tsc2007.c +++ b/nuttx/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> diff --git a/nuttx/drivers/loop.c b/nuttx/drivers/loop.c index 77cb9daf6..322a421b5 100644 --- a/nuttx/drivers/loop.c +++ b/nuttx/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 diff --git a/nuttx/drivers/mmcsd/mmcsd_sdio.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c index 20ef3ebe6..90c73261a 100644 --- a/nuttx/drivers/mmcsd/mmcsd_sdio.c +++ b/nuttx/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> diff --git a/nuttx/drivers/mmcsd/mmcsd_spi.c b/nuttx/drivers/mmcsd/mmcsd_spi.c index b5f5829a2..f7bbd64b4 100644 --- a/nuttx/drivers/mmcsd/mmcsd_spi.c +++ b/nuttx/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" diff --git a/nuttx/drivers/mtd/at24xx.c b/nuttx/drivers/mtd/at24xx.c index 67d7f1f52..d157a9c47 100644 --- a/nuttx/drivers/mtd/at24xx.c +++ b/nuttx/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> diff --git a/nuttx/drivers/mtd/at45db.c b/nuttx/drivers/mtd/at45db.c index fab9d0d9b..037cc5e76 100644 --- a/nuttx/drivers/mtd/at45db.c +++ b/nuttx/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> diff --git a/nuttx/drivers/mtd/flash_eraseall.c b/nuttx/drivers/mtd/flash_eraseall.c index 5f607da35..77666ff03 100644 --- a/nuttx/drivers/mtd/flash_eraseall.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/drivers/mtd/ftl.c b/nuttx/drivers/mtd/ftl.c index f01a19470..bf6d1e739 100644 --- a/nuttx/drivers/mtd/ftl.c +++ b/nuttx/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> diff --git a/nuttx/drivers/mtd/m25px.c b/nuttx/drivers/mtd/m25px.c index 3c4229b95..1c242875f 100644 --- a/nuttx/drivers/mtd/m25px.c +++ b/nuttx/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> diff --git a/nuttx/drivers/mtd/rammtd.c b/nuttx/drivers/mtd/rammtd.c index c50db6a3a..72acc73e8 100644 --- a/nuttx/drivers/mtd/rammtd.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c index a59a94bb4..0c922e69e 100644 --- a/nuttx/drivers/mtd/ramtron.c +++ b/nuttx/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> diff --git a/nuttx/drivers/mtd/skeleton.c b/nuttx/drivers/mtd/skeleton.c index 8b09b5c15..673ddadb3 100644 --- a/nuttx/drivers/mtd/skeleton.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/drivers/pipes/fifo.c b/nuttx/drivers/pipes/fifo.c index 9e663b4a8..951a4e04e 100644 --- a/nuttx/drivers/pipes/fifo.c +++ b/nuttx/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" diff --git a/nuttx/drivers/pipes/pipe.c b/nuttx/drivers/pipes/pipe.c index 541f3bda4..5ca72e640 100644 --- a/nuttx/drivers/pipes/pipe.c +++ b/nuttx/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> diff --git a/nuttx/drivers/pipes/pipe_common.c b/nuttx/drivers/pipes/pipe_common.c index 52077beed..0282d8acd 100644 --- a/nuttx/drivers/pipes/pipe_common.c +++ b/nuttx/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 diff --git a/nuttx/drivers/power/battery.c b/nuttx/drivers/power/battery.c index 70337b5cb..698e5571b 100644 --- a/nuttx/drivers/power/battery.c +++ b/nuttx/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: diff --git a/nuttx/drivers/pwm.c b/nuttx/drivers/pwm.c index adfe0e2e8..78b800634 100644 --- a/nuttx/drivers/pwm.c +++ b/nuttx/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> diff --git a/nuttx/drivers/ramdisk.c b/nuttx/drivers/ramdisk.c index bfa0618d6..0a6a7b714 100644 --- a/nuttx/drivers/ramdisk.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/drivers/ramlog.c b/nuttx/drivers/ramlog.c index c6bb07b15..775d03ec8 100644 --- a/nuttx/drivers/ramlog.c +++ b/nuttx/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> diff --git a/nuttx/drivers/sensors/lm75.c b/nuttx/drivers/sensors/lm75.c index 397cb9582..cd83f645b 100644 --- a/nuttx/drivers/sensors/lm75.c +++ b/nuttx/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> diff --git a/nuttx/drivers/sensors/qencoder.c b/nuttx/drivers/sensors/qencoder.c index 84bc15813..a56adec9a 100644 --- a/nuttx/drivers/sensors/qencoder.c +++ b/nuttx/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> diff --git a/nuttx/drivers/serial/lowconsole.c b/nuttx/drivers/serial/lowconsole.c index 2c7d639e2..1fac49a57 100644 --- a/nuttx/drivers/serial/lowconsole.c +++ b/nuttx/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 diff --git a/nuttx/drivers/serial/serial.c b/nuttx/drivers/serial/serial.c index 2d09574f9..43f3cd8e0 100644 --- a/nuttx/drivers/serial/serial.c +++ b/nuttx/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> /************************************************************************************ diff --git a/nuttx/drivers/serial/uart_16550.c b/nuttx/drivers/serial/uart_16550.c index 07c0dae36..201751dd0 100644 --- a/nuttx/drivers/serial/uart_16550.c +++ b/nuttx/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> diff --git a/nuttx/drivers/usbdev/usbmsc.c b/nuttx/drivers/usbdev/usbmsc.c index 51caeb431..3c17bfd66 100644 --- a/nuttx/drivers/usbdev/usbmsc.c +++ b/nuttx/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> diff --git a/nuttx/drivers/usbdev/usbmsc.h b/nuttx/drivers/usbdev/usbmsc.h index 4400a3392..4b0817248 100644 --- a/nuttx/drivers/usbdev/usbmsc.h +++ b/nuttx/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 */ }; diff --git a/nuttx/drivers/usbhost/usbhost_hidkbd.c b/nuttx/drivers/usbhost/usbhost_hidkbd.c index baf18703d..ce951e1e6 100644 --- a/nuttx/drivers/usbhost/usbhost_hidkbd.c +++ b/nuttx/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> diff --git a/nuttx/drivers/usbhost/usbhost_skeleton.c b/nuttx/drivers/usbhost/usbhost_skeleton.c index 206b347c5..0a88a4f1b 100644 --- a/nuttx/drivers/usbhost/usbhost_skeleton.c +++ b/nuttx/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> diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c index 82409eac3..2817c2446 100644 --- a/nuttx/drivers/usbhost/usbhost_storage.c +++ b/nuttx/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> diff --git a/nuttx/fs/fat/fs_configfat.c b/nuttx/fs/fat/fs_configfat.c index 9ec7573a7..3a55a5215 100644 --- a/nuttx/fs/fat/fs_configfat.c +++ b/nuttx/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" diff --git a/nuttx/fs/fat/fs_fat32.c b/nuttx/fs/fat/fs_fat32.c index 909d5a2dc..2c98368a1 100644 --- a/nuttx/fs/fat/fs_fat32.c +++ b/nuttx/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" diff --git a/nuttx/fs/fat/fs_fat32.h b/nuttx/fs/fat/fs_fat32.h index dfdc6bef2..5b82ff701 100644 --- a/nuttx/fs/fat/fs_fat32.h +++ b/nuttx/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 diff --git a/nuttx/fs/fat/fs_fat32attrib.c b/nuttx/fs/fat/fs_fat32attrib.c index 73fd1c081..f58ed81bb 100644 --- a/nuttx/fs/fat/fs_fat32attrib.c +++ b/nuttx/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" diff --git a/nuttx/fs/fat/fs_fat32dirent.c b/nuttx/fs/fat/fs_fat32dirent.c index 814bc3d82..742fa1eeb 100644 --- a/nuttx/fs/fat/fs_fat32dirent.c +++ b/nuttx/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" diff --git a/nuttx/fs/fat/fs_fat32util.c b/nuttx/fs/fat/fs_fat32util.c index 8324ef598..397467c41 100644 --- a/nuttx/fs/fat/fs_fat32util.c +++ b/nuttx/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" diff --git a/nuttx/fs/fat/fs_mkfatfs.c b/nuttx/fs/fat/fs_mkfatfs.c index 14d661f93..7a8b2ab92 100644 --- a/nuttx/fs/fat/fs_mkfatfs.c +++ b/nuttx/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" diff --git a/nuttx/fs/fat/fs_writefat.c b/nuttx/fs/fat/fs_writefat.c index 714ad389e..02d55d625 100644 --- a/nuttx/fs/fat/fs_writefat.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_close.c b/nuttx/fs/fs_close.c index d6f8bf54a..ce506725a 100644 --- a/nuttx/fs/fs_close.c +++ b/nuttx/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> diff --git a/nuttx/fs/fs_closeblockdriver.c b/nuttx/fs/fs_closeblockdriver.c index ae80f9532..c6900ee80 100644 --- a/nuttx/fs/fs_closeblockdriver.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_closedir.c b/nuttx/fs/fs_closedir.c index d88bc3347..572be4053 100644 --- a/nuttx/fs/fs_closedir.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_dup.c b/nuttx/fs/fs_dup.c index df4e1affa..a72509595 100644 --- a/nuttx/fs/fs_dup.c +++ b/nuttx/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" /**************************************************************************** diff --git a/nuttx/fs/fs_fcntl.c b/nuttx/fs/fs_fcntl.c index 686b83319..f0102ce8e 100644 --- a/nuttx/fs/fs_fcntl.c +++ b/nuttx/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> diff --git a/nuttx/fs/fs_fdopen.c b/nuttx/fs/fs_fdopen.c index 8201ebbae..4d3f79894 100644 --- a/nuttx/fs/fs_fdopen.c +++ b/nuttx/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> /**************************************************************************** diff --git a/nuttx/fs/fs_filedup.c b/nuttx/fs/fs_filedup.c index 84431b9b1..746c3aa61 100644 --- a/nuttx/fs/fs_filedup.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_files.c b/nuttx/fs/fs_files.c index 066c9a4ef..d4dec1992 100644 --- a/nuttx/fs/fs_files.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_findblockdriver.c b/nuttx/fs/fs_findblockdriver.c index bfe59b21d..63178a0db 100644 --- a/nuttx/fs/fs_findblockdriver.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_fsync.c b/nuttx/fs/fs_fsync.c index 08d47e578..6e6d81591 100644 --- a/nuttx/fs/fs_fsync.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_inode.c b/nuttx/fs/fs_inode.c index a03448a0e..a2b9d27d8 100644 --- a/nuttx/fs/fs_inode.c +++ b/nuttx/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" diff --git a/nuttx/fs/fs_inodeaddref.c b/nuttx/fs/fs_inodeaddref.c index c5dea2e4c..c43f23479 100644 --- a/nuttx/fs/fs_inodeaddref.c +++ b/nuttx/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" /**************************************************************************** diff --git a/nuttx/fs/fs_inodefind.c b/nuttx/fs/fs_inodefind.c index c4cbeab9e..22b8d9861 100644 --- a/nuttx/fs/fs_inodefind.c +++ b/nuttx/fs/fs_inodefind.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" diff --git a/nuttx/fs/fs_inoderelease.c b/nuttx/fs/fs_inoderelease.c index 58aaf3659..27b36985a 100644 --- a/nuttx/fs/fs_inoderelease.c +++ b/nuttx/fs/fs_inoderelease.c @@ -42,7 +42,7 @@ #include <errno.h> #include <nuttx/kmalloc.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_inoderemove.c b/nuttx/fs/fs_inoderemove.c index cdc61f66a..314596e38 100644 --- a/nuttx/fs/fs_inoderemove.c +++ b/nuttx/fs/fs_inoderemove.c @@ -42,7 +42,7 @@ #include <errno.h> #include <nuttx/kmalloc.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_inodereserve.c b/nuttx/fs/fs_inodereserve.c index f1a899244..e48b2793a 100644 --- a/nuttx/fs/fs_inodereserve.c +++ b/nuttx/fs/fs_inodereserve.c @@ -43,7 +43,7 @@ #include <errno.h> #include <nuttx/kmalloc.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h index af5cd615a..326a4f8b5 100644 --- a/nuttx/fs/fs_internal.h +++ b/nuttx/fs/fs_internal.h @@ -46,7 +46,7 @@ #include <stdint.h> #include <dirent.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/compiler.h> /**************************************************************************** diff --git a/nuttx/fs/fs_mkdir.c b/nuttx/fs/fs_mkdir.c index af5c406b5..3564ba7f6 100644 --- a/nuttx/fs/fs_mkdir.c +++ b/nuttx/fs/fs_mkdir.c @@ -41,7 +41,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_mount.c b/nuttx/fs/fs_mount.c index d2e0dc961..cdb60592a 100644 --- a/nuttx/fs/fs_mount.c +++ b/nuttx/fs/fs_mount.c @@ -45,7 +45,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #ifdef CONFIG_APPS_BINDIR # include <apps/apps.h> diff --git a/nuttx/fs/fs_open.c b/nuttx/fs/fs_open.c index 467eef858..1bbae2f02 100644 --- a/nuttx/fs/fs_open.c +++ b/nuttx/fs/fs_open.c @@ -45,7 +45,7 @@ #ifdef CONFIG_FILE_MODE #include <stdarg.h> #endif -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" /**************************************************************************** diff --git a/nuttx/fs/fs_openblockdriver.c b/nuttx/fs/fs_openblockdriver.c index cd5759b45..62b33bee7 100644 --- a/nuttx/fs/fs_openblockdriver.c +++ b/nuttx/fs/fs_openblockdriver.c @@ -41,7 +41,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_opendir.c b/nuttx/fs/fs_opendir.c index 2783da097..f070115c4 100644 --- a/nuttx/fs/fs_opendir.c +++ b/nuttx/fs/fs_opendir.c @@ -46,8 +46,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" diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c index b81a4d3c6..f7795a170 100644 --- a/nuttx/fs/fs_poll.c +++ b/nuttx/fs/fs_poll.c @@ -47,7 +47,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/sched.h> #include <nuttx/clock.h> diff --git a/nuttx/fs/fs_readdir.c b/nuttx/fs/fs_readdir.c index 3be669abb..a1cbfb89b 100644 --- a/nuttx/fs/fs_readdir.c +++ b/nuttx/fs/fs_readdir.c @@ -43,8 +43,8 @@ #include <dirent.h> #include <errno.h> -#include <nuttx/fs.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/fs.h> +#include <nuttx/fs/dirent.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_registerblockdriver.c b/nuttx/fs/fs_registerblockdriver.c index bd5c08be4..fb5e462c2 100644 --- a/nuttx/fs/fs_registerblockdriver.c +++ b/nuttx/fs/fs_registerblockdriver.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> #include <sys/types.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" /**************************************************************************** diff --git a/nuttx/fs/fs_registerdriver.c b/nuttx/fs/fs_registerdriver.c index 053c80061..4e76adc2c 100644 --- a/nuttx/fs/fs_registerdriver.c +++ b/nuttx/fs/fs_registerdriver.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> #include <sys/types.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" /**************************************************************************** diff --git a/nuttx/fs/fs_rename.c b/nuttx/fs/fs_rename.c index 119115595..83e0ac368 100644 --- a/nuttx/fs/fs_rename.c +++ b/nuttx/fs/fs_rename.c @@ -41,7 +41,7 @@ #include <stdio.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_rewinddir.c b/nuttx/fs/fs_rewinddir.c index a53da7725..271132010 100644 --- a/nuttx/fs/fs_rewinddir.c +++ b/nuttx/fs/fs_rewinddir.c @@ -42,8 +42,8 @@ #include <dirent.h> #include <errno.h> -#include <nuttx/fs.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/fs.h> +#include <nuttx/fs/dirent.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_rmdir.c b/nuttx/fs/fs_rmdir.c index 53342f4de..4a45e42ba 100644 --- a/nuttx/fs/fs_rmdir.c +++ b/nuttx/fs/fs_rmdir.c @@ -41,7 +41,7 @@ #include <unistd.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_seekdir.c b/nuttx/fs/fs_seekdir.c index 6443ecd35..fa304545e 100644 --- a/nuttx/fs/fs_seekdir.c +++ b/nuttx/fs/fs_seekdir.c @@ -43,8 +43,8 @@ #include <dirent.h> #include <errno.h> -#include <nuttx/fs.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/fs.h> +#include <nuttx/fs/dirent.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_select.c b/nuttx/fs/fs_select.c index 14ccfe287..f87697310 100644 --- a/nuttx/fs/fs_select.c +++ b/nuttx/fs/fs_select.c @@ -49,7 +49,7 @@ #include <debug.h> #include <nuttx/kmalloc.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_umount.c b/nuttx/fs/fs_umount.c index d085ac4d0..05865d28e 100644 --- a/nuttx/fs/fs_umount.c +++ b/nuttx/fs/fs_umount.c @@ -41,7 +41,7 @@ #include <sys/mount.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_unlink.c b/nuttx/fs/fs_unlink.c index 013718dc8..c2842ce4d 100644 --- a/nuttx/fs/fs_unlink.c +++ b/nuttx/fs/fs_unlink.c @@ -41,7 +41,7 @@ #include <unistd.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_unregisterblockdriver.c b/nuttx/fs/fs_unregisterblockdriver.c index 23860205b..ccf5a2aa9 100644 --- a/nuttx/fs/fs_unregisterblockdriver.c +++ b/nuttx/fs/fs_unregisterblockdriver.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/fs_unregisterdriver.c b/nuttx/fs/fs_unregisterdriver.c index 159816a6e..c891c7d02 100644 --- a/nuttx/fs/fs_unregisterdriver.c +++ b/nuttx/fs/fs_unregisterdriver.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "fs_internal.h" diff --git a/nuttx/fs/nxffs/nxffs.h b/nuttx/fs/nxffs/nxffs.h index 426bd6316..616dc7197 100644 --- a/nuttx/fs/nxffs/nxffs.h +++ b/nuttx/fs/nxffs/nxffs.h @@ -50,7 +50,7 @@ #include <semaphore.h> #include <nuttx/mtd.h> -#include <nuttx/nxffs.h> +#include <nuttx/fs/nxffs.h> /**************************************************************************** * Pre-processor Definitions @@ -1038,7 +1038,7 @@ extern int nxffs_pack(FAR struct nxffs_volume_s *volume); * Standard mountpoint operation methods * * Description: - * See include/nuttx/fs.h + * See include/nuttx/fs/fs.h * * - nxffs_open() and nxffs_close() are defined in nxffs_open.c * - nxffs_read() is defined in nxffs_read.c diff --git a/nuttx/fs/nxffs/nxffs_dirent.c b/nuttx/fs/nxffs/nxffs_dirent.c index 40ae8662f..562a5320b 100644 --- a/nuttx/fs/nxffs/nxffs_dirent.c +++ b/nuttx/fs/nxffs/nxffs_dirent.c @@ -47,9 +47,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/mtd.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/dirent.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_dump.c b/nuttx/fs/nxffs/nxffs_dump.c index 938b1276d..d816ba6ca 100644 --- a/nuttx/fs/nxffs/nxffs_dump.c +++ b/nuttx/fs/nxffs/nxffs_dump.c @@ -47,7 +47,7 @@ #include <crc32.h> #include <nuttx/kmalloc.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #include <nuttx/mtd.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_initialize.c b/nuttx/fs/nxffs/nxffs_initialize.c index da729302f..6d93a318a 100644 --- a/nuttx/fs/nxffs/nxffs_initialize.c +++ b/nuttx/fs/nxffs/nxffs_initialize.c @@ -48,8 +48,8 @@ #include <nuttx/kmalloc.h> #include <nuttx/mtd.h> -#include <nuttx/fs.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/fs.h> +#include <nuttx/fs/ioctl.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_ioctl.c b/nuttx/fs/nxffs/nxffs_ioctl.c index a70dba87c..41fabfbee 100644 --- a/nuttx/fs/nxffs/nxffs_ioctl.c +++ b/nuttx/fs/nxffs/nxffs_ioctl.c @@ -46,8 +46,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> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_open.c b/nuttx/fs/nxffs/nxffs_open.c index c00e2ea6d..339e25edc 100644 --- a/nuttx/fs/nxffs/nxffs_open.c +++ b/nuttx/fs/nxffs/nxffs_open.c @@ -50,7 +50,7 @@ #include <debug.h> #include <nuttx/kmalloc.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/mtd.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_read.c b/nuttx/fs/nxffs/nxffs_read.c index 02f7e528b..6ba49ca72 100644 --- a/nuttx/fs/nxffs/nxffs_read.c +++ b/nuttx/fs/nxffs/nxffs_read.c @@ -48,7 +48,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/mtd.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_stat.c b/nuttx/fs/nxffs/nxffs_stat.c index be38c018f..afb18093c 100644 --- a/nuttx/fs/nxffs/nxffs_stat.c +++ b/nuttx/fs/nxffs/nxffs_stat.c @@ -49,7 +49,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/mtd.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_unlink.c b/nuttx/fs/nxffs/nxffs_unlink.c index f2295a966..9d0d5b49e 100644 --- a/nuttx/fs/nxffs/nxffs_unlink.c +++ b/nuttx/fs/nxffs/nxffs_unlink.c @@ -46,7 +46,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/mtd.h> #include "nxffs.h" diff --git a/nuttx/fs/nxffs/nxffs_write.c b/nuttx/fs/nxffs/nxffs_write.c index 02c9c5c5c..bf32b0fb4 100644 --- a/nuttx/fs/nxffs/nxffs_write.c +++ b/nuttx/fs/nxffs/nxffs_write.c @@ -48,7 +48,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/mtd.h> #include "nxffs.h" diff --git a/nuttx/fs/romfs/fs_romfs.c b/nuttx/fs/romfs/fs_romfs.c index ca420939c..8a2e69665 100644 --- a/nuttx/fs/romfs/fs_romfs.c +++ b/nuttx/fs/romfs/fs_romfs.c @@ -56,9 +56,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fs.h> -#include <nuttx/ioctl.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/fs.h> +#include <nuttx/fs/ioctl.h> +#include <nuttx/fs/dirent.h> #include "fs_romfs.h" diff --git a/nuttx/fs/romfs/fs_romfs.h b/nuttx/fs/romfs/fs_romfs.h index 111006788..f89196ff7 100644 --- a/nuttx/fs/romfs/fs_romfs.h +++ b/nuttx/fs/romfs/fs_romfs.h @@ -47,7 +47,7 @@ #include <stdint.h> #include <stdbool.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/dirent.h> #include "../fs_internal.h" diff --git a/nuttx/fs/romfs/fs_romfsutil.c b/nuttx/fs/romfs/fs_romfsutil.c index d441c0c8b..ec009da89 100644 --- a/nuttx/fs/romfs/fs_romfsutil.c +++ b/nuttx/fs/romfs/fs_romfsutil.c @@ -51,8 +51,8 @@ #include <assert.h> #include <debug.h> -#include <nuttx/ioctl.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/ioctl.h> +#include <nuttx/fs/dirent.h> #include "fs_romfs.h" diff --git a/nuttx/include/netinet/arp.h b/nuttx/include/netinet/arp.h index f2a9a0366..34cfc84a4 100644 --- a/nuttx/include/netinet/arp.h +++ b/nuttx/include/netinet/arp.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> #include <stdint.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/include/nuttx/analog/adc.h b/nuttx/include/nuttx/analog/adc.h index 39e94b26e..c1e78ff7e 100644 --- a/nuttx/include/nuttx/analog/adc.h +++ b/nuttx/include/nuttx/analog/adc.h @@ -52,7 +52,7 @@ #include <stdint.h> #include <stdbool.h> #include <semaphore.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/spi.h> /************************************************************************************ diff --git a/nuttx/include/nuttx/analog/dac.h b/nuttx/include/nuttx/analog/dac.h index 23cbb9941..524c66507 100644 --- a/nuttx/include/nuttx/analog/dac.h +++ b/nuttx/include/nuttx/analog/dac.h @@ -52,7 +52,7 @@ #include <stdint.h> #include <stdbool.h> #include <semaphore.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/spi.h> /************************************************************************************ diff --git a/nuttx/include/nuttx/can.h b/nuttx/include/nuttx/can.h index 7fd4bfb15..31d34478e 100644 --- a/nuttx/include/nuttx/can.h +++ b/nuttx/include/nuttx/can.h @@ -48,7 +48,7 @@ #include <stdbool.h> #include <semaphore.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #ifdef CONFIG_CAN diff --git a/nuttx/include/nuttx/dirent.h b/nuttx/include/nuttx/fs/dirent.h index 51816115b..31f27957c 100644 --- a/nuttx/include/nuttx/dirent.h +++ b/nuttx/include/nuttx/fs/dirent.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/dirent.h + * include/nuttx/fs/dirent.h * - * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009, 2011-2012 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 @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_DIRENT_H -#define __INCLUDE_NUTTX_DIRENT_H +#ifndef __INCLUDE_NUTTX_FS_DIRENT_H +#define __INCLUDE_NUTTX_FS_DIRENT_H /**************************************************************************** * Included Files @@ -46,7 +46,7 @@ #include <stdint.h> #include <dirent.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /**************************************************************************** * Pre-processor Definitions @@ -196,5 +196,5 @@ extern "C" { } #endif -#endif /* __INCLUDE_NUTTX_DIRENT_H */ +#endif /* __INCLUDE_NUTTX_FS_DIRENT_H */ diff --git a/nuttx/include/nuttx/fat.h b/nuttx/include/nuttx/fs/fat.h index cedd0a277..f69bd8571 100644 --- a/nuttx/include/nuttx/fat.h +++ b/nuttx/include/nuttx/fs/fat.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/fat.h + * include/nuttx/fs/fat.h * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2012 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 @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_FAT_H -#define __NUTTX_FAT_H +#ifndef __INCLUDE_NUTTX_FS_FAT_H +#define __INCLUDE_NUTTX_FS_FAT_H /**************************************************************************** * Included Files @@ -85,4 +85,4 @@ EXTERN int fat_setattrib(const char *path, fat_attrib_t setbits, fat_attrib_t cl } #endif -#endif /* __NUTTX_FAT_H */ +#endif /* __INCLUDE_NUTTX_FS_FAT_H */ diff --git a/nuttx/include/nuttx/fs.h b/nuttx/include/nuttx/fs/fs.h index 11f6a862a..5b62e69d8 100644 --- a/nuttx/include/nuttx/fs.h +++ b/nuttx/include/nuttx/fs/fs.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/fs.h + * include/nuttx/fs/fs.h * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2011-2012 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 @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_FS_H -#define __INCLUDE_NUTTX_FS_H +#ifndef __INCLUDE_NUTTX_FS_FS_H +#define __INCLUDE_NUTTX_FS_FS_H /**************************************************************************** * Included Files @@ -436,4 +436,4 @@ EXTERN ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t off } #endif -#endif /* __INCLUDE_NUTTX_FS_H */ +#endif /* __INCLUDE_NUTTX_FS_FS_H */ diff --git a/nuttx/include/nuttx/ioctl.h b/nuttx/include/nuttx/fs/ioctl.h index c269b0772..8832f212e 100644 --- a/nuttx/include/nuttx/ioctl.h +++ b/nuttx/include/nuttx/fs/ioctl.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/ioctl.h + * include/nuttx/fs/ioctl.h * * Copyright (C) 2008, 2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_IOCTL_H -#define __NUTTX_IOCTL_H +#ifndef __INCLUDE_NUTTX_FS_IOCTL_H +#define __INCLUDE_NUTTX_FS_IOCTL_H /**************************************************************************** * Included Files @@ -220,4 +220,4 @@ extern "C" { } #endif -#endif /* __NUTTX_IOCTL_H */ +#endif /* __INCLUDE_NUTTX_FS_IOCTL_H */ diff --git a/nuttx/include/nuttx/mkfatfs.h b/nuttx/include/nuttx/fs/mkfatfs.h index bcf25bb57..ccf5b7603 100644 --- a/nuttx/include/nuttx/mkfatfs.h +++ b/nuttx/include/nuttx/fs/mkfatfs.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/mkfat.h + * include/nuttx/fs/mkfatfs.h * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 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 @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_MKFATFS_H -#define __NUTTX_MKFATFS_H +#ifndef __INCLUDE_NUTTX_FS_MKFATFS_H +#define __INCLUDE_NUTTX_FS_MKFATFS_H /**************************************************************************** * Included Files @@ -142,4 +142,4 @@ EXTERN int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt); } #endif -#endif /* __NUTTX_MKFATFS_H */ +#endif /* __INCLUDE_NUTTX_FS_MKFATFS_H */ diff --git a/nuttx/include/nuttx/nxffs.h b/nuttx/include/nuttx/fs/nxffs.h index 4d1343676..79c5b1d94 100644 --- a/nuttx/include/nuttx/nxffs.h +++ b/nuttx/include/nuttx/fs/nxffs.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/nxffs.h + * include/nuttx/fs/nxffs.h * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2011-2012 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 @@ -33,15 +33,15 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NXFFS_H -#define __INCLUDE_NUTTX_NXFFS_H +#ifndef __INCLUDE_NUTTX_FS_NXFFS_H +#define __INCLUDE_NUTTX_FS_NXFFS_H /**************************************************************************** * Included Files ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /**************************************************************************** * Pre-Processor Definitions @@ -147,4 +147,4 @@ EXTERN int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose); } #endif -#endif /* __INCLUDE_NUTTX_NXFFS_H */ +#endif /* __INCLUDE_NUTTX_FS_NXFFS_H */ diff --git a/nuttx/include/nuttx/input/touchscreen.h b/nuttx/include/nuttx/input/touchscreen.h index de888e38d..3f2ec74aa 100644 --- a/nuttx/include/nuttx/input/touchscreen.h +++ b/nuttx/include/nuttx/input/touchscreen.h @@ -50,7 +50,7 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #ifdef CONFIG_INPUT diff --git a/nuttx/include/nuttx/lib.h b/nuttx/include/nuttx/lib.h index 32910ad21..220af2030 100644 --- a/nuttx/include/nuttx/lib.h +++ b/nuttx/include/nuttx/lib.h @@ -42,7 +42,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/include/nuttx/mtd.h b/nuttx/include/nuttx/mtd.h index 4dc76e1ef..585c1f2ea 100644 --- a/nuttx/include/nuttx/mtd.h +++ b/nuttx/include/nuttx/mtd.h @@ -109,7 +109,7 @@ struct mtd_dev_s * - MTDIOC_GEOMETRY: Get MTD geometry * - MTDIOC_XIPBASE: Convert block to physical address for eXecute-In-Place * - MTDIOC_BULKERASE: Erase the entire device - * (see include/nuttx/ioctl.h) + * (see include/nuttx/fs/ioctl.h) */ int (*ioctl)(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg); diff --git a/nuttx/include/nuttx/net/ioctl.h b/nuttx/include/nuttx/net/ioctl.h index 402226519..4f8a49a7d 100644 --- a/nuttx/include/nuttx/net/ioctl.h +++ b/nuttx/include/nuttx/net/ioctl.h @@ -40,7 +40,7 @@ * Included Files ****************************************************************************/ -#include <nuttx/ioctl.h> /* _SIOCBASE, etc. */ +#include <nuttx/fs/ioctl.h> /* _SIOCBASE, etc. */ /**************************************************************************** * Definitions diff --git a/nuttx/include/nuttx/power/battery.h b/nuttx/include/nuttx/power/battery.h index 314f3287b..5c341789f 100644 --- a/nuttx/include/nuttx/power/battery.h +++ b/nuttx/include/nuttx/power/battery.h @@ -42,7 +42,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #include <stdbool.h> #include <semaphore.h> diff --git a/nuttx/include/nuttx/pwm.h b/nuttx/include/nuttx/pwm.h index 3ebea1c13..3fc5f8cfd 100644 --- a/nuttx/include/nuttx/pwm.h +++ b/nuttx/include/nuttx/pwm.h @@ -59,7 +59,7 @@ #include <fixedmath.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #ifdef CONFIG_PWM diff --git a/nuttx/include/nuttx/regex.h b/nuttx/include/nuttx/regex.h index 15f44a747..7c32af361 100644 --- a/nuttx/include/nuttx/regex.h +++ b/nuttx/include/nuttx/regex.h @@ -42,7 +42,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/include/nuttx/sensors/lm75.h b/nuttx/include/nuttx/sensors/lm75.h index 43c90a466..d34509ada 100644 --- a/nuttx/include/nuttx/sensors/lm75.h +++ b/nuttx/include/nuttx/sensors/lm75.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/include/nuttx/sensors/qencoder.h b/nuttx/include/nuttx/sensors/qencoder.h index b1ca83259..d21fa1248 100644 --- a/nuttx/include/nuttx/sensors/qencoder.h +++ b/nuttx/include/nuttx/sensors/qencoder.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #ifdef CONFIG_QENCODER diff --git a/nuttx/include/nuttx/serial.h b/nuttx/include/nuttx/serial.h index 880bc1c01..88faca879 100644 --- a/nuttx/include/nuttx/serial.h +++ b/nuttx/include/nuttx/serial.h @@ -46,7 +46,7 @@ #include <stdint.h> #include <stdbool.h> #include <semaphore.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /************************************************************************************ * Definitions diff --git a/nuttx/include/nuttx/tioctl.h b/nuttx/include/nuttx/tioctl.h index 9d5663b42..69d965ca8 100644 --- a/nuttx/include/nuttx/tioctl.h +++ b/nuttx/include/nuttx/tioctl.h @@ -33,7 +33,7 @@ * ********************************************************************************************/ /* This function should not be included directly. Rather, it should be included indirectly - * via include/nuttx/ioctl.h. + * via include/nuttx/fs/ioctl.h. */ #ifndef __INCLUDE_NUTTX_TIOCTL_H diff --git a/nuttx/include/nuttx/usb/cdcacm.h b/nuttx/include/nuttx/usb/cdcacm.h index 1c27f731f..4722a2eb7 100644 --- a/nuttx/include/nuttx/usb/cdcacm.h +++ b/nuttx/include/nuttx/usb/cdcacm.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #include <nuttx/usb/usb.h> /**************************************************************************** diff --git a/nuttx/include/stdio.h b/nuttx/include/stdio.h index 8da720c25..b2b2ae928 100644 --- a/nuttx/include/stdio.h +++ b/nuttx/include/stdio.h @@ -48,7 +48,7 @@ #include <semaphore.h> #include <time.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/include/sys/ioctl.h b/nuttx/include/sys/ioctl.h index 73564dc5a..3d1874869 100644 --- a/nuttx/include/sys/ioctl.h +++ b/nuttx/include/sys/ioctl.h @@ -43,7 +43,7 @@ /* Get NuttX configuration and NuttX-specific IOCTL definitions */ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> /* Include network ioctls info */ diff --git a/nuttx/include/sys/sockio.h b/nuttx/include/sys/sockio.h index e69425926..abfc2f562 100644 --- a/nuttx/include/sys/sockio.h +++ b/nuttx/include/sys/sockio.h @@ -43,7 +43,7 @@ /* Get NuttX configuration and NuttX-specific network IOCTL definitions */ #include <nuttx/config.h> -#include <nuttx/ioctl.h> +#include <nuttx/fs/ioctl.h> #include <nuttx/net/ioctl.h> /**************************************************************************** diff --git a/nuttx/lib/dirent/lib_readdirr.c b/nuttx/lib/dirent/lib_readdirr.c index 59a32566d..47c5b9a7b 100644 --- a/nuttx/lib/dirent/lib_readdirr.c +++ b/nuttx/lib/dirent/lib_readdirr.c @@ -43,7 +43,7 @@ #include <dirent.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> /**************************************************************************** * Private Functions diff --git a/nuttx/lib/dirent/lib_telldir.c b/nuttx/lib/dirent/lib_telldir.c index 5bc9a5fed..3753b326e 100644 --- a/nuttx/lib/dirent/lib_telldir.c +++ b/nuttx/lib/dirent/lib_telldir.c @@ -43,8 +43,8 @@ #include <dirent.h> #include <errno.h> -#include <nuttx/fs.h> -#include <nuttx/dirent.h> +#include <nuttx/fs/fs.h> +#include <nuttx/fs/dirent.h> /**************************************************************************** * Private Functions diff --git a/nuttx/lib/misc/lib_init.c b/nuttx/lib/misc/lib_init.c index 55bcbf0af..fb246b1ad 100644 --- a/nuttx/lib/misc/lib_init.c +++ b/nuttx/lib/misc/lib_init.c @@ -44,7 +44,7 @@ #include <errno.h> #include <nuttx/kmalloc.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/lib.h> #include "lib_internal.h" diff --git a/nuttx/lib/misc/lib_streamsem.c b/nuttx/lib/misc/lib_streamsem.c index a8610382e..3d86ab280 100644 --- a/nuttx/lib/misc/lib_streamsem.c +++ b/nuttx/lib/misc/lib_streamsem.c @@ -44,7 +44,7 @@ #include <assert.h> #include <semaphore.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "lib_internal.h" diff --git a/nuttx/lib/stdio/lib_fflush.c b/nuttx/lib/stdio/lib_fflush.c index c77ab686a..e0278d0d2 100644 --- a/nuttx/lib/stdio/lib_fflush.c +++ b/nuttx/lib/stdio/lib_fflush.c @@ -44,7 +44,7 @@ #include <fcntl.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "lib_internal.h" diff --git a/nuttx/lib/stdio/lib_fileno.c b/nuttx/lib/stdio/lib_fileno.c index 7366194ba..ec25ce6d0 100644 --- a/nuttx/lib/stdio/lib_fileno.c +++ b/nuttx/lib/stdio/lib_fileno.c @@ -42,7 +42,7 @@ #include <stdio.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #if CONFIG_NFILE_STREAMS > 0 diff --git a/nuttx/lib/stdio/lib_libfflush.c b/nuttx/lib/stdio/lib_libfflush.c index 5da9c763d..ec1591e7a 100644 --- a/nuttx/lib/stdio/lib_libfflush.c +++ b/nuttx/lib/stdio/lib_libfflush.c @@ -49,7 +49,7 @@ #include <fcntl.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "lib_internal.h" diff --git a/nuttx/lib/stdio/lib_libflushall.c b/nuttx/lib/stdio/lib_libflushall.c index 0b95fc22d..8de0c3309 100644 --- a/nuttx/lib/stdio/lib_libflushall.c +++ b/nuttx/lib/stdio/lib_libflushall.c @@ -43,7 +43,7 @@ #include <fcntl.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "lib_internal.h" diff --git a/nuttx/lib/stdio/lib_libnoflush.c b/nuttx/lib/stdio/lib_libnoflush.c index 90e5f9f5c..370a1e8f7 100644 --- a/nuttx/lib/stdio/lib_libnoflush.c +++ b/nuttx/lib/stdio/lib_libnoflush.c @@ -44,7 +44,7 @@ #include <fcntl.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "lib_internal.h" diff --git a/nuttx/lib/stdio/lib_ungetc.c b/nuttx/lib/stdio/lib_ungetc.c index e27428fa4..73e591729 100644 --- a/nuttx/lib/stdio/lib_ungetc.c +++ b/nuttx/lib/stdio/lib_ungetc.c @@ -45,7 +45,7 @@ #include <stdio.h> #include <fcntl.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "lib_internal.h" /**************************************************************************** diff --git a/nuttx/sched/atexit.c b/nuttx/sched/atexit.c index da1be1c2a..8a491aa14 100644 --- a/nuttx/sched/atexit.c +++ b/nuttx/sched/atexit.c @@ -45,7 +45,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "os_internal.h" diff --git a/nuttx/sched/exit.c b/nuttx/sched/exit.c index 651fec8cb..56258844f 100644 --- a/nuttx/sched/exit.c +++ b/nuttx/sched/exit.c @@ -43,7 +43,7 @@ #include <unistd.h> #include <debug.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "os_internal.h" /**************************************************************************** diff --git a/nuttx/sched/on_exit.c b/nuttx/sched/on_exit.c index 9824ec735..965a3e805 100644 --- a/nuttx/sched/on_exit.c +++ b/nuttx/sched/on_exit.c @@ -45,7 +45,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "os_internal.h" diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c index e99f3c988..889c28fb8 100644 --- a/nuttx/sched/os_start.c +++ b/nuttx/sched/os_start.c @@ -44,7 +44,7 @@ #include <nuttx/arch.h> #include <nuttx/compiler.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/net/net.h> #include <nuttx/lib.h> #include <nuttx/kmalloc.h> diff --git a/nuttx/sched/sched_releasefiles.c b/nuttx/sched/sched_releasefiles.c index 699dfb7b1..dc08488dc 100644 --- a/nuttx/sched/sched_releasefiles.c +++ b/nuttx/sched/sched_releasefiles.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> #include <sched.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/net/net.h> #include <nuttx/lib.h> diff --git a/nuttx/sched/sched_setupidlefiles.c b/nuttx/sched/sched_setupidlefiles.c index a8827314c..7b2839685 100644 --- a/nuttx/sched/sched_setupidlefiles.c +++ b/nuttx/sched/sched_setupidlefiles.c @@ -46,7 +46,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/net/net.h> #include "os_internal.h" diff --git a/nuttx/sched/sched_setuppthreadfiles.c b/nuttx/sched/sched_setuppthreadfiles.c index 6af6e8a66..75e20ef0a 100644 --- a/nuttx/sched/sched_setuppthreadfiles.c +++ b/nuttx/sched/sched_setuppthreadfiles.c @@ -41,7 +41,7 @@ #include <sched.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/net/net.h> #include <nuttx/lib.h> diff --git a/nuttx/sched/sched_setupstreams.c b/nuttx/sched/sched_setupstreams.c index 96d3c3939..0706e1188 100644 --- a/nuttx/sched/sched_setupstreams.c +++ b/nuttx/sched/sched_setupstreams.c @@ -42,7 +42,7 @@ #include <sched.h> #include <fcntl.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/net/net.h> #include <nuttx/lib.h> diff --git a/nuttx/sched/sched_setuptaskfiles.c b/nuttx/sched/sched_setuptaskfiles.c index 2b7e40763..3b75fa350 100644 --- a/nuttx/sched/sched_setuptaskfiles.c +++ b/nuttx/sched/sched_setuptaskfiles.c @@ -42,7 +42,7 @@ #include <sched.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include <nuttx/net/net.h> #include "os_internal.h" diff --git a/nuttx/sched/task_exithook.c b/nuttx/sched/task_exithook.c index 7dc07e79f..44073165a 100644 --- a/nuttx/sched/task_exithook.c +++ b/nuttx/sched/task_exithook.c @@ -44,7 +44,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "os_internal.h" #include "sig_internal.h" diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv index 2499cd4ab..bff8c50ca 100644 --- a/nuttx/syscall/syscall.csv +++ b/nuttx/syscall/syscall.csv @@ -13,7 +13,7 @@ "dup2","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int","int" "exit","stdlib.h","","void","int" "fcntl","fcntl.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int","int","..." -"fs_fdopen","nuttx/fs.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR struct file_struct*","int","int","FAR _TCB*" +"fs_fdopen","nuttx/fs/fs.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR struct file_struct*","int","int","FAR _TCB*" "fsync","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT)","int","int" "get_errno","errno.h","","int" "getenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","FAR char*","FAR const char*" |