summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/examples/ostest/Kconfig2
-rw-r--r--apps/examples/ostest/aio.c4
-rw-r--r--apps/examples/ostest/ostest.h2
-rw-r--r--apps/examples/ostest/ostest_main.c2
-rw-r--r--nuttx/fs/aio/Kconfig15
-rw-r--r--nuttx/fs/aio/Make.defs4
-rw-r--r--nuttx/fs/aio/aio_cancel.c6
-rw-r--r--nuttx/fs/aio/aio_fsync.c8
-rw-r--r--nuttx/fs/aio/aio_read.c8
-rw-r--r--nuttx/fs/aio/aio_signal.c6
-rw-r--r--nuttx/fs/aio/aio_write.c8
-rw-r--r--nuttx/include/aio.h8
-rw-r--r--nuttx/include/signal.h4
-rw-r--r--nuttx/libc/aio/Make.defs2
-rw-r--r--nuttx/libc/aio/aio_error.c4
-rw-r--r--nuttx/libc/aio/aio_return.c4
-rw-r--r--nuttx/libc/aio/aio_suspend.c4
-rw-r--r--nuttx/libc/aio/lio_listio.c4
-rw-r--r--nuttx/sched/Kconfig2
19 files changed, 56 insertions, 41 deletions
diff --git a/apps/examples/ostest/Kconfig b/apps/examples/ostest/Kconfig
index b40ee3311..dd12c09b5 100644
--- a/apps/examples/ostest/Kconfig
+++ b/apps/examples/ostest/Kconfig
@@ -35,7 +35,7 @@ config EXAMPLES_OSTEST_NBARRIER_THREADS
config EXAMPLES_OSTEST_AIO
bool "Asynchronous I/O Tests"
default n
- depends on LIBC_AIO && FS_WRITABLE
+ depends on FS_AIO && FS_WRITABLE
---help---
Enables test of asynchronous I/O. You must have a mounted, writable
directory in place to use this test.
diff --git a/apps/examples/ostest/aio.c b/apps/examples/ostest/aio.c
index 9e1628783..2a0e5a555 100644
--- a/apps/examples/ostest/aio.c
+++ b/apps/examples/ostest/aio.c
@@ -50,7 +50,7 @@
#include "ostest.h"
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
/****************************************************************************
* Pre-processor Definitions
@@ -228,4 +228,4 @@ void aio_test(void)
}
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/apps/examples/ostest/ostest.h b/apps/examples/ostest/ostest.h
index b99bb15c7..71d71c03a 100644
--- a/apps/examples/ostest/ostest.h
+++ b/apps/examples/ostest/ostest.h
@@ -113,7 +113,7 @@ void fpu_test(void);
/* aio.c ********************************************************************/
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
void aio_test(void);
#endif
diff --git a/apps/examples/ostest/ostest_main.c b/apps/examples/ostest/ostest_main.c
index 0b3d37f3b..d36287b78 100644
--- a/apps/examples/ostest/ostest_main.c
+++ b/apps/examples/ostest/ostest_main.c
@@ -326,7 +326,7 @@ static int user_main(int argc, char *argv[])
check_test_memory_usage();
#endif
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
/* Check asynchronous I/O */
printf("\nuser_main: AIO test\n");
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 */
diff --git a/nuttx/include/aio.h b/nuttx/include/aio.h
index 202a24417..55e2ffa58 100644
--- a/nuttx/include/aio.h
+++ b/nuttx/include/aio.h
@@ -55,16 +55,16 @@
/* These interfaces are not available to kernel code */
#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && defined(__KERNEL__)
-# undef CONFIG_LIBC_AIO
+# undef CONFIG_FS_AIO
#endif
/* Work queue support is required. The low-priority work queue is required
* so that the asynchronous I/O does not interfere with high priority driver
* operations. If this pre-requisite is met, then asynchronous I/O support
- * can be enabled with CONFIG_LIBC_AIO
+ * can be enabled with CONFIG_FS_AIO
*/
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
#ifndef CONFIG_SCHED_WORKQUEUE
# error Asynchronous I/O requires CONFIG_SCHED_WORKQUEUE
@@ -171,5 +171,5 @@ int lio_listio(int mode, FAR struct aiocb *const list[], int nent,
}
#endif
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
#endif /* __INCLUDE_AIO_H */
diff --git a/nuttx/include/signal.h b/nuttx/include/signal.h
index 2589881dc..ffb77e079 100644
--- a/nuttx/include/signal.h
+++ b/nuttx/include/signal.h
@@ -1,7 +1,7 @@
/********************************************************************************
* include/signal.h
*
- * Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009, 2011, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -101,7 +101,7 @@
# endif
#endif
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
# ifndef CONFIG_SIG_POLL
# define SIGPOLL 5 /* Sent when an asynchronous I/O event occurs */
# else
diff --git a/nuttx/libc/aio/Make.defs b/nuttx/libc/aio/Make.defs
index e9187bcd2..7b5dda99e 100644
--- a/nuttx/libc/aio/Make.defs
+++ b/nuttx/libc/aio/Make.defs
@@ -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/libc/aio/aio_error.c b/nuttx/libc/aio/aio_error.c
index abdffbde7..4d1eca99c 100644
--- a/nuttx/libc/aio/aio_error.c
+++ b/nuttx/libc/aio/aio_error.c
@@ -43,7 +43,7 @@
#include <assert.h>
#include <errno.h>
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
/****************************************************************************
* Pre-processor Definitions
@@ -111,4 +111,4 @@ int aio_error(FAR const struct aiocb *aiocbp)
return OK;
}
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/libc/aio/aio_return.c b/nuttx/libc/aio/aio_return.c
index c33a07e53..076d8fb29 100644
--- a/nuttx/libc/aio/aio_return.c
+++ b/nuttx/libc/aio/aio_return.c
@@ -43,7 +43,7 @@
#include <assert.h>
#include <errno.h>
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
/****************************************************************************
* Pre-processor Definitions
@@ -115,4 +115,4 @@ ssize_t aio_return(FAR struct aiocb *aiocbp)
return aiocbp->aio_result;
}
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/libc/aio/aio_suspend.c b/nuttx/libc/aio/aio_suspend.c
index 8e7083338..b6a76ead7 100644
--- a/nuttx/libc/aio/aio_suspend.c
+++ b/nuttx/libc/aio/aio_suspend.c
@@ -45,7 +45,7 @@
#include <assert.h>
#include <errno.h>
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
/****************************************************************************
* Pre-processor Definitions
@@ -166,4 +166,4 @@ int aio_suspend(FAR const struct aiocb *const list[], int nent,
return ret >= 0 ? OK : ERROR;
}
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/libc/aio/lio_listio.c b/nuttx/libc/aio/lio_listio.c
index c9843a533..45bb87bcf 100644
--- a/nuttx/libc/aio/lio_listio.c
+++ b/nuttx/libc/aio/lio_listio.c
@@ -48,7 +48,7 @@
#include "lib_internal.h"
#include "aio/aio.h"
-#ifdef CONFIG_LIBC_AIO
+#ifdef CONFIG_FS_AIO
/****************************************************************************
* Pre-processor Definitions
@@ -726,4 +726,4 @@ int lio_listio(int mode, FAR struct aiocb *const list[], int nent,
return OK;
}
-#endif /* CONFIG_LIBC_AIO */
+#endif /* CONFIG_FS_AIO */
diff --git a/nuttx/sched/Kconfig b/nuttx/sched/Kconfig
index 4fe0ad762..3b9f8d006 100644
--- a/nuttx/sched/Kconfig
+++ b/nuttx/sched/Kconfig
@@ -770,7 +770,7 @@ config SIG_SIGCHLD
config SIG_POLL
int "SIGPOLL"
default 5
- depends on LIBC_AIO
+ depends on FS_AIO
---help---
The SIGPOLL signal is sent to a process when an asynchronous I/O
event occurs (meaning it has been polled). Default: 5
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-12 21:26:52 +0000