summaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-05 14:28:36 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-05 14:28:36 -0600
commit2bbdd8cc73bea765bf9464e3316c1b8a5cd8a47e (patch)
tree1a51e901ba0aafc8f4774094b7b3cee00fb013ac /apps/examples
parentcb1b0f39a06f94ef1c52996b742179ab125a4338 (diff)
downloadnuttx-2bbdd8cc73bea765bf9464e3316c1b8a5cd8a47e.tar.gz
nuttx-2bbdd8cc73bea765bf9464e3316c1b8a5cd8a47e.tar.bz2
nuttx-2bbdd8cc73bea765bf9464e3316c1b8a5cd8a47e.zip
More changes for AIO integration
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/ostest/aio.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/examples/ostest/aio.c b/apps/examples/ostest/aio.c
index b98480840..9e1628783 100644
--- a/apps/examples/ostest/aio.c
+++ b/apps/examples/ostest/aio.c
@@ -62,7 +62,7 @@
#define AIO_NCTRLBLKS 5
-#define AIO_FILEPATH "EXAMPLES_OSTEST_AIOPATH" "/aio_test.dat"
+#define AIO_FILEPATH CONFIG_EXAMPLES_OSTEST_AIOPATH "/aio_test.dat"
/****************************************************************************
* Private Data
@@ -121,7 +121,7 @@ static void init_aiocb(bool signal)
FAR struct aiocb *aiocbp;
int i;
- memset(g_aiocb, 0xff, AIO_NCTRLBLKS*sizeof(struct aiocb));
+ memset(g_aiocbs, 0xff, (AIO_NCTRLBLKS-1)*sizeof(struct aiocb));
memset(g_rdbuffer, 0xff, AIO_RDBUFFER_SIZE);
for (i = 0; i < AIO_NCTRLBLKS; i++)
@@ -145,11 +145,8 @@ static void init_aiocb(bool signal)
static int check_done(void)
{
FAR struct aiocb *aiocbp;
- int ret;
int i;
- ret = OK; /* Assume success */
-
/* Check each entry in the list. Break out of the loop if any entry
* has not completed.
*/
@@ -163,20 +160,20 @@ static int check_done(void)
{
/* Check if the I/O has completed */
- printf("%d. result = %d\n", aiocbp->aio_result);
+ printf("%d. result = %d\n", i, aiocbp->aio_result);
if (aiocbp->aio_result == -EINPROGRESS)
{
/* No.. return -EINPROGRESS */
- printf("--- NOT finished ---\n");
+ printf(" --- NOT finished ---\n");
return -EINPROGRESS;
}
/* Check for an I/O error */
- else if (aiocbp->aio_result < 0 && ret == OK)
+ else if (aiocbp->aio_result < 0)
{
- printf("--- ERROR ---\n");
+ printf(" --- Failed I/O transfer ---\n");
}
}
}