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
This commit is contained in:
patacongo
2012-03-21 18:01:07 +00:00
parent 9269560d36
commit 2fe4ad52f8
182 changed files with 252 additions and 250 deletions
+1 -1
View File
@@ -43,7 +43,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
/****************************************************************************
* Pre-processor Definitions
+1 -1
View File
@@ -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>
/************************************************************************************
+1 -1
View File
@@ -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>
/************************************************************************************
+1 -1
View File
@@ -48,7 +48,7 @@
#include <stdbool.h>
#include <semaphore.h>
#include <nuttx/fs.h>
#include <nuttx/fs/fs.h>
#ifdef CONFIG_CAN
@@ -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 */
@@ -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 */
+6 -6
View File
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
+1 -1
View File
@@ -50,7 +50,7 @@
************************************************************************************/
#include <nuttx/config.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
#ifdef CONFIG_INPUT
+1 -1
View File
@@ -42,7 +42,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/fs.h>
#include <nuttx/fs/fs.h>
/****************************************************************************
* Pre-Processor Definitions
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -40,7 +40,7 @@
* Included Files
****************************************************************************/
#include <nuttx/ioctl.h> /* _SIOCBASE, etc. */
#include <nuttx/fs/ioctl.h> /* _SIOCBASE, etc. */
/****************************************************************************
* Definitions
+1 -1
View File
@@ -42,7 +42,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <stdbool.h>
#include <semaphore.h>
+1 -1
View File
@@ -59,7 +59,7 @@
#include <fixedmath.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
#ifdef CONFIG_PWM
+1 -1
View File
@@ -42,7 +42,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/fs.h>
#include <nuttx/fs/fs.h>
/****************************************************************************
* Pre-Processor Definitions
+1 -1
View File
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
/****************************************************************************
* Pre-Processor Definitions
+1 -1
View File
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
#ifdef CONFIG_QENCODER
+1 -1
View File
@@ -46,7 +46,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <semaphore.h>
#include <nuttx/fs.h>
#include <nuttx/fs/fs.h>
/************************************************************************************
* Definitions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/usb/usb.h>
/****************************************************************************
+1 -1
View File
@@ -48,7 +48,7 @@
#include <semaphore.h>
#include <time.h>
#include <nuttx/fs.h>
#include <nuttx/fs/fs.h>
/****************************************************************************
* Pre-processor Definitions
+1 -1
View File
@@ -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 */
+1 -1
View File
@@ -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>
/****************************************************************************