diff options
Diffstat (limited to 'nuttx/include')
25 files changed, 55 insertions, 55 deletions
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> /**************************************************************************** |