Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into bas24

Browse Source
This commit is contained in:
Gregory Nutt
2014-10-27 18:12:38 -06:00
parent a2b2985766 f8f6a8fbce
commit 3d0208f7ec
4 changed files with 224 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/freedom-kl25z/nsh/defconfig
+220 -67
View File
File diff suppressed because it is too large Load Diff
fs/aio/aio_read.c
+1 -1
View File
@@ -111,7 +111,7 @@ static void aio_read_worker(FAR void *arg)
aiocbp = aioc_decant(aioc); aiocbp = aioc_decant(aioc);
#if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK) #if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK)
if (aioc->fildes >= CONFIG_NFILE_DESCRIPTORS) if (aiocbp->aio_fildes >= CONFIG_NFILE_DESCRIPTORS)
#endif #endif
#ifdef AIO_HAVE_FILEP #ifdef AIO_HAVE_FILEP
{ {
fs/aio/aio_write.c
+1 -1
View File
@@ -129,7 +129,7 @@ static void aio_write_worker(FAR void *arg)
aiocbp = aioc_decant(aioc); aiocbp = aioc_decant(aioc);
#if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK) #if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK)
if (aioc->fildes >= CONFIG_NFILE_DESCRIPTORS) if (aiocbp->aio_fildes >= CONFIG_NFILE_DESCRIPTORS)
#endif #endif
#ifdef AIO_HAVE_FILEP #ifdef AIO_HAVE_FILEP
{ {
fs/aio/aioc_contain.c
+2 -1
View File
@@ -40,6 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sched.h> #include <sched.h>
#include <errno.h>
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
@@ -106,7 +107,7 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
#endif #endif
#if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK) #if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK)
if (aioc->fildes >= CONFIG_NFILE_DESCRIPTORS) if (aiocbp->aio_fildes >= CONFIG_NFILE_DESCRIPTORS)
#endif #endif
#ifdef AIO_HAVE_FILEP #ifdef AIO_HAVE_FILEP
{ {