diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-06 11:02:58 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-06 11:02:58 -0600 |
| commit | 39622e91aee672e907020057965a5145661c2fa8 (patch) | |
| tree | a6ff7bb33639b6a6b5863f178f998228e1f877f4 /nuttx/fs | |
| parent | e905bd483febf980a574ae3911fb5a330e6a31a9 (diff) | |
| download | px4-nuttx-39622e91aee672e907020057965a5145661c2fa8.tar.gz px4-nuttx-39622e91aee672e907020057965a5145661c2fa8.tar.bz2 px4-nuttx-39622e91aee672e907020057965a5145661c2fa8.zip | |
Basic fixes for a clean simulator build with last big fs changes
Diffstat (limited to 'nuttx/fs')
| -rw-r--r-- | nuttx/fs/aio/Make.defs | 4 | ||||
| -rw-r--r-- | nuttx/fs/aio/aio.h | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | nuttx/fs/aio/aio_initialize.c | 2 | ||||
| -rw-r--r-- | nuttx/fs/aio/aioc_contain.c | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/nuttx/fs/aio/Make.defs b/nuttx/fs/aio/Make.defs index b9855bcb4..46a747707 100644 --- a/nuttx/fs/aio/Make.defs +++ b/nuttx/fs/aio/Make.defs @@ -37,8 +37,8 @@ ifeq ($(CONFIG_FS_AIO),y) # Add the asynchronous I/O C files to the build -CSRCS += aio_cancel.c aio_fsync.c aio_initialize.c aio_read.c aio_signal.c -CSRCS += aio_write.c +CSRCS += aio_cancel.c aioc_contain.c aio_fsync.c aio_initialize.c aio_read.c +CSRCS += aio_signal.c aio_write.c # Add the asynchronous I/O directory to the build diff --git a/nuttx/fs/aio/aio.h b/nuttx/fs/aio/aio.h index e6b85cc62..ea6be2c86 100644 --- a/nuttx/fs/aio/aio.h +++ b/nuttx/fs/aio/aio.h @@ -43,6 +43,7 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <string.h> #include <aio.h> #include <queue.h> @@ -153,7 +154,7 @@ void aio_unlock(void); * ****************************************************************************/ -FAR struct aio_container_s *aioc_lock(void); +FAR struct aio_container_s *aioc_alloc(void); /**************************************************************************** * Name: aioc_free diff --git a/nuttx/fs/aio/aio_initialize.c b/nuttx/fs/aio/aio_initialize.c index 2686a80ed..1360eaee7 100755..100644 --- a/nuttx/fs/aio/aio_initialize.c +++ b/nuttx/fs/aio/aio_initialize.c @@ -180,7 +180,7 @@ void aio_unlock(void) * ****************************************************************************/ -FAR struct aio_container_s *aioc_lock(void) +FAR struct aio_container_s *aioc_alloc(void) { FAR struct aio_container_s *aioc; diff --git a/nuttx/fs/aio/aioc_contain.c b/nuttx/fs/aio/aioc_contain.c index 34842bd21..26e67338b 100644 --- a/nuttx/fs/aio/aioc_contain.c +++ b/nuttx/fs/aio/aioc_contain.c @@ -1,5 +1,5 @@ /**************************************************************************** - * libc/aio/aio_contain.c + * libc/aio/aioc_contain.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -41,7 +41,7 @@ #include <sched.h> -#include <nuttx/fs.h> +#include <nuttx/fs/fs.h> #include "aio/aio.h" @@ -157,7 +157,7 @@ FAR struct aiocb *aioc_decant(FAR struct aio_container_s *aioc) /* De-cant the AIO control block and return the container to the free list */ - aiocbp = aioc->acioc_aiocbp; + aiocbp = aioc->aioc_aiocbp; aioc_free(aioc); return aiocbp; } |