diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-13 18:01:46 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-13 18:01:46 +0000 |
commit | ea45a3718fc280b291b2f45d467a2494973636fa (patch) | |
tree | 446e7ccffd35a3baa2afefa3afc05ba6fdd09427 /nuttx/fs | |
parent | c37fdc28c2cfdf41a549ba245c1cad85b757e53a (diff) | |
download | px4-nuttx-ea45a3718fc280b291b2f45d467a2494973636fa.tar.gz px4-nuttx-ea45a3718fc280b291b2f45d467a2494973636fa.tar.bz2 px4-nuttx-ea45a3718fc280b291b2f45d467a2494973636fa.zip |
types blkcnt_t and off_t should not depend on memory model; Remove non-standard type STATUS
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2330 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/fs')
-rw-r--r-- | nuttx/fs/fs_inoderemove.c | 4 | ||||
-rw-r--r-- | nuttx/fs/fs_internal.h | 8 | ||||
-rw-r--r-- | nuttx/fs/fs_registerblockdriver.c | 6 | ||||
-rw-r--r-- | nuttx/fs/fs_registerdriver.c | 4 | ||||
-rw-r--r-- | nuttx/fs/fs_unregisterblockdriver.c | 6 | ||||
-rw-r--r-- | nuttx/fs/fs_unregisterdriver.c | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/nuttx/fs/fs_inoderemove.c b/nuttx/fs/fs_inoderemove.c index 1dcfce467..2034234db 100644 --- a/nuttx/fs/fs_inoderemove.c +++ b/nuttx/fs/fs_inoderemove.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs/fs_inoderemove.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -105,7 +105,7 @@ static void inode_unlink(struct inode *node, * NOTE: Caller must hold the inode semaphore ****************************************************************************/ -STATUS inode_remove(const char *path) +int inode_remove(const char *path) { const char *name = path; FAR struct inode *node; diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h index 34b722e98..48849436f 100644 --- a/nuttx/fs/fs_internal.h +++ b/nuttx/fs/fs_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** - * fs_internal.h + * fs/fs_internal.h * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -208,7 +208,7 @@ EXTERN FAR struct inode *inode_reserve(const char *path); /* fs_inoderemove.c **********************************************************/ -EXTERN STATUS inode_remove(const char *path); +EXTERN int inode_remove(const char *path); /* fs_inodefind.c ************************************************************/ diff --git a/nuttx/fs/fs_registerblockdriver.c b/nuttx/fs/fs_registerblockdriver.c index aad6a9224..248e3e2a7 100644 --- a/nuttx/fs/fs_registerblockdriver.c +++ b/nuttx/fs/fs_registerblockdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs_registerblockdriver.c + * fs/fs_registerblockdriver.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -67,12 +67,12 @@ * Name: register_driver ****************************************************************************/ -STATUS register_blockdriver(const char *path, +int register_blockdriver(const char *path, const struct block_operations *bops, mode_t mode, void *priv) { struct inode *node; - STATUS ret = -ENOMEM; + int ret = -ENOMEM; /* Insert an inode for the device driver -- we need to hold the inode semaphore * to prevent access to the tree while we this. This is because we will have a diff --git a/nuttx/fs/fs_registerdriver.c b/nuttx/fs/fs_registerdriver.c index 5299ba28d..7b3520435 100644 --- a/nuttx/fs/fs_registerdriver.c +++ b/nuttx/fs/fs_registerdriver.c @@ -67,11 +67,11 @@ * Name: register_driver ****************************************************************************/ -STATUS register_driver(const char *path, const struct file_operations *fops, +int register_driver(const char *path, const struct file_operations *fops, mode_t mode, void *priv) { struct inode *node; - STATUS ret = ERROR; + int ret = ERROR; /* Insert a dummy node -- we need to hold the inode semaphore * to do this because we will have a momentarily bad structure. diff --git a/nuttx/fs/fs_unregisterblockdriver.c b/nuttx/fs/fs_unregisterblockdriver.c index 2e0bc6673..cb737f2e3 100644 --- a/nuttx/fs/fs_unregisterblockdriver.c +++ b/nuttx/fs/fs_unregisterblockdriver.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs/fs_unregisterblockdriver.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -71,9 +71,9 @@ * Name: unregister_blockdriver() ****************************************************************************/ -STATUS unregister_blockdriver(const char *path) +int unregister_blockdriver(const char *path) { - STATUS ret; + int ret; inode_semtake(); ret = inode_remove(path); inode_semgive(); diff --git a/nuttx/fs/fs_unregisterdriver.c b/nuttx/fs/fs_unregisterdriver.c index 377154263..2455742db 100644 --- a/nuttx/fs/fs_unregisterdriver.c +++ b/nuttx/fs/fs_unregisterdriver.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs/fs_unregisterdriver.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -71,9 +71,9 @@ * Name: unregister_driver() ****************************************************************************/ -STATUS unregister_driver(const char *path) +int unregister_driver(const char *path) { - STATUS ret; + int ret; inode_semtake(); ret = inode_remove(path); inode_semgive(); |