diff options
author | px4dev <px4@purgatory.org> | 2012-08-11 12:03:04 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-08-11 12:03:04 -0700 |
commit | 24688ae7f9522cb44924980ea2364c5a1029fd61 (patch) | |
tree | 49dfa0f4bcbfe31e5bd156af260dc2c9ad49eb10 /nuttx/include | |
parent | 6c4aadedf42de266e592f84cda27d8af1bbe56b5 (diff) | |
parent | 0512367a9c707f26b9a2b9057cf64714f46a0dc4 (diff) | |
download | px4-firmware-24688ae7f9522cb44924980ea2364c5a1029fd61.tar.gz px4-firmware-24688ae7f9522cb44924980ea2364c5a1029fd61.tar.bz2 px4-firmware-24688ae7f9522cb44924980ea2364c5a1029fd61.zip |
Merge branch 'NuttX/master'
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/nuttx/fs/dirent.h | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/fs/fs.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/include/nuttx/fs/dirent.h b/nuttx/include/nuttx/fs/dirent.h index 8aad4242b..75867c87a 100644 --- a/nuttx/include/nuttx/fs/dirent.h +++ b/nuttx/include/nuttx/fs/dirent.h @@ -65,12 +65,12 @@ * reference, a position, a dirent structure, and file-system-specific * information. * - * For the root psuedo-file system, we need retain only the 'next' inode + * For the root pseudo-file system, we need retain only the 'next' inode * need for the next readdir() operation. We hold a reference on this * inode so we know that it will persist until closedir is called. */ -struct fs_psuedodir_s +struct fs_pseudodir_s { struct inode *fd_next; /* The inode for the next call to readdir() */ }; @@ -140,7 +140,7 @@ struct fs_dirent_s { /* This is the node that was opened by opendir. The type of the inode * determines the way that the readdir() operations are performed. For the - * psuedo root psuedo-file system, it is also used to support rewind. + * pseudo root pseudo-file system, it is also used to support rewind. * * We hold a reference on this inode so we know that it will persist until * closedir() is called (although inodes linked to this inode may change). @@ -166,9 +166,9 @@ struct fs_dirent_s union { - /* Private data used by the built-in psuedo-file system */ + /* Private data used by the built-in pseudo-file system */ - struct fs_psuedodir_s psuedo; + struct fs_pseudodir_s pseudo; /* Private data used by other file systems */ diff --git a/nuttx/include/nuttx/fs/fs.h b/nuttx/include/nuttx/fs/fs.h index 07d28597e..81f81622f 100644 --- a/nuttx/include/nuttx/fs/fs.h +++ b/nuttx/include/nuttx/fs/fs.h @@ -199,7 +199,7 @@ union inode_ops_u #endif }; -/* This structure represents one inode in the Nuttx psuedo-file system */ +/* This structure represents one inode in the Nuttx pseudo-file system */ struct inode { @@ -342,7 +342,7 @@ EXTERN void weak_function fs_initialize(void); * mountpoint inodes. It is intended to support the mount() command to * when the mount command is used to enumerate mounts. * - * NOTE 1: Use with caution... The psuedo-file system is locked throughout + * NOTE 1: Use with caution... The pseudo-file system is locked throughout * the traversal. * NOTE 2: The search algorithm is recursive and could, in principle, use * an indeterminant amount of stack space. This will not usually be a @@ -415,7 +415,7 @@ EXTERN int register_blockdriver(const char *path, * Name: unregister_driver * * Description: - * Remove the character driver inode at 'path' from the psuedo-file system + * Remove the character driver inode at 'path' from the pseudo-file system * ****************************************************************************/ @@ -426,7 +426,7 @@ EXTERN int unregister_driver(const char *path); * Name: unregister_blockdriver * * Description: - * Remove the block driver inode at 'path' from the psuedo-file system + * Remove the block driver inode at 'path' from the pseudo-file system * ****************************************************************************/ |