Rename CONFIG_LIBC_AIO to CONFIG_FS_AIO since it is now an OS property

7 files changed, 35 insertions, 20 deletions

diff --git a/nuttx/fs/aio/Kconfig b/nuttx/fs/aio/Kconfig
new file mode 100644
index 000000000..d4089bc83
--- /dev/null
+++ b/nuttx/fs/aio/Kconfig
@@ -0,0 +1,15 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config FS_AIO
+	bool "Asynchronous I/O support"
+	default n
+	depends on SCHED_LPWORK
+	---help---
+		Enable support for aynchronous I/O.  This selection enables the
+		interfaces declared in include/aio.h.
+
+if FS_AIO
+endif
diff --git a/nuttx/fs/aio/Make.defs b/nuttx/fs/aio/Make.defs
index c1d0bea8a..194b70cf2 100644
--- a/nuttx/fs/aio/Make.defs
+++ b/nuttx/fs/aio/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# fs/aio/Make.defs
+# libc/fs/Make.defs
 #
 #   Copyright (C) 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_LIBC_AIO),y)
+ifeq ($(CONFIG_FS_AIO),y)
 
 # Add the asynchronous I/O C files to the build
 
diff --git a/nuttx/fs/aio/aio_cancel.c b/nuttx/fs/aio/aio_cancel.c
index 7e6c17d1e..ec49c3ecf 100644
--- a/nuttx/fs/aio/aio_cancel.c
+++ b/nuttx/fs/aio/aio_cancel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/aio/aio_cancel.c
+ * libc/aio/aio_cancel.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 
 #include "aio/aio.h"
 
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -164,4 +164,4 @@ int aio_cancel(int fildes, FAR struct aiocb *aiocbp)
   return ret;
 }
 
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/fs/aio/aio_fsync.c b/nuttx/fs/aio/aio_fsync.c
index f4441d5df..ba4336638 100644
--- a/nuttx/fs/aio/aio_fsync.c
+++ b/nuttx/fs/aio/aio_fsync.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/aio/aio_fsync.c
+ * libc/aio/aio_fsync.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,13 +43,13 @@
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/wqueue.h>
 
+#include "lib_internal.h"
 #include "aio/aio.h"
 
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -225,4 +225,4 @@ int aio_fsync(int op, FAR struct aiocb *aiocbp)
   return OK;
 }
 
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/fs/aio/aio_read.c b/nuttx/fs/aio/aio_read.c
index 90c6a024a..b6eedf2f7 100644
--- a/nuttx/fs/aio/aio_read.c
+++ b/nuttx/fs/aio/aio_read.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/aio/aio_read.c
+ * libc/aio/aio_read.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,13 +44,13 @@
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/wqueue.h>
 
+#include "lib_internal.h"
 #include "aio/aio.h"
 
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -273,4 +273,4 @@ int aio_read(FAR struct aiocb *aiocbp)
   return OK;
 }
 
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/fs/aio/aio_signal.c b/nuttx/fs/aio/aio_signal.c
index 60cb0be77..aeec14f91 100644
--- a/nuttx/fs/aio/aio_signal.c
+++ b/nuttx/fs/aio/aio_signal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/aio/aio_signal.c
+ * libc/aio/aio_signal.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 
 #include "aio/aio.h"
 
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -145,4 +145,4 @@ int aio_signal(FAR struct aiocb *aiocbp)
   return OK;
 }
 
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/fs/aio/aio_write.c b/nuttx/fs/aio/aio_write.c
index 51a470964..fef44974b 100644
--- a/nuttx/fs/aio/aio_write.c
+++ b/nuttx/fs/aio/aio_write.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/aio/aio_write.c
+ * libc/aio/aio_write.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,13 +45,13 @@
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/wqueue.h>
 
+#include "lib_internal.h"
 #include "aio/aio.h"
 
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -304,4 +304,4 @@ int aio_write(FAR struct aiocb *aiocbp)
   return OK;
 }
 
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */