diff options
| -rw-r--r-- | cpukit/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/librtemsNfs.h | 4 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/nfs.c | 6 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 36 |
4 files changed, 31 insertions, 23 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f53aa0b714..d3d882a054 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2010-07-01 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * libfs/src/nfsclient/src/nfs.c, libfs/src/nfsclient/src/nfs.c, + libfs/src/nfsclient/src/librtemsNfs.h: Renamed + rtems_nfsfs_initialize() in rtems_nfs_initialize(). + * sapi/include/confdefs.h: Reflect changes above. Renamed + *_miniIMFS in *_MINIIMFS. Renamed *_NFSFS in *_NFS. + 2010-06-30 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1472/cpukit diff --git a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h b/cpukit/libfs/src/nfsclient/src/librtemsNfs.h index 01ef9a3a76..fc17d1de7f 100644 --- a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h +++ b/cpukit/libfs/src/nfsclient/src/librtemsNfs.h @@ -143,8 +143,8 @@ nfsMountsShow(FILE *f); * Filesystem mount table mount handler. Do not call, use the mount call. */ int -rtems_nfsfs_initialize(rtems_filesystem_mount_table_entry_t *mt_entry, - const void *data); +rtems_nfs_initialize(rtems_filesystem_mount_table_entry_t *mt_entry, + const void *data); /* A utility routine to find the path leading to a * rtems_filesystem_location_info_t node. diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c index 6882d1a66e..6b349445c2 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -1908,8 +1908,8 @@ struct rtems_filesystem_mount_table_entry_tt { #endif -int rtems_nfsfs_initialize( - rtems_filesystem_mount_table_entry_t *mt_entry, +int rtems_nfs_initialize( + rtems_filesystem_mount_table_entry_t *mt_entry, const void *data ) { @@ -2479,7 +2479,7 @@ struct _rtems_filesystem_operations_table nfs_fs_ops = { nfs_chown, /* OPTIONAL; may be defaulted */ nfs_freenode, /* OPTIONAL; may be defaulted; (release node_access) */ nfs_mount, /* OPTIONAL; may be defaulted */ - rtems_nfsfs_initialize, /* OPTIONAL; may be defaulted -- not used anymore */ + rtems_nfs_initialize, /* OPTIONAL; may be defaulted -- not used anymore */ nfs_unmount, /* OPTIONAL; may be defaulted */ nfs_fsunmount_me, /* OPTIONAL; may be defaulted */ nfs_utime, /* OPTIONAL; may be defaulted */ diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 562bea791a..b1206b0411 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -185,12 +185,12 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * Add file filesystems to the default filesystem table. * * List of available file systems. You can define as many as you like: - * CONFIGURE_FILESYSTEM_miniIMFS - MiniIMFS, use DEVFS now + * CONFIGURE_FILESYSTEM_MINIIMFS - MiniIMFS, use DEVFS now * CONFIGURE_FILESYSTEM_IMFS - In Memory File System (IMFS) * CONFIGURE_FILESYSTEM_DEVFS - Device File System (DSVFS) * CONFIGURE_FILESYSTEM_TFTPFS - TFTP File System, networking enabled * CONFIGURE_FILESYSTEM_FTPFS - FTP File System, networking enabled - * CONFIGURE_FILESYSTEM_NFSFS - Network File System, networking enabled + * CONFIGURE_FILESYSTEM_NFS - Network File System, networking enabled * CONFIGURE_FILESYSTEM_DOSFS - DOS File System, uses libblock * CONFIGURE_FILESYSTEM_RFS - RTEMS File System (RFS), uses libblock * @@ -212,12 +212,12 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * been disabled. */ #ifdef CONFIGURE_FILESYSTEM_ALL - #define CONFIGURE_FILESYSTEM_miniIMFS + #define CONFIGURE_FILESYSTEM_MINIIMFS #define CONFIGURE_FILESYSTEM_IMFS #define CONFIGURE_FILESYSTEM_DEVFS #define CONFIGURE_FILESYSTEM_TFTPFS #define CONFIGURE_FILESYSTEM_FTPFS - #define CONFIGURE_FILESYSTEM_NFSFS + #define CONFIGURE_FILESYSTEM_NFS #define CONFIGURE_FILESYSTEM_DOSFS #define CONFIGURE_FILESYSTEM_RFS #endif @@ -236,12 +236,12 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM #endif - #undef CONFIGURE_FILESYSTEM_miniIMFS + #undef CONFIGURE_FILESYSTEM_MINIIMFS #undef CONFIGURE_FILESYSTEM_IMFS #undef CONFIGURE_FILESYSTEM_DEVFS #undef CONFIGURE_FILESYSTEM_TFTPFS #undef CONFIGURE_FILESYSTEM_FTPFS - #undef CONFIGURE_FILESYSTEM_NFSFS + #undef CONFIGURE_FILESYSTEM_NFS #undef CONFIGURE_FILESYSTEM_DOSFS #undef CONFIGURE_FILESYSTEM_RFS #endif @@ -254,7 +254,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) #define CONFIGURE_FILESYSTEM_DEVFS #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM) - #define CONFIGURE_FILESYSTEM_miniIMFS + #define CONFIGURE_FILESYSTEM_MINIIMFS #elif !defined(CONFIGURE_FILESYSTEM_IMFS) #define CONFIGURE_FILESYSTEM_IMFS #endif @@ -282,7 +282,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * This defines the miniIMFS file system table entry. */ #if !defined(CONFIGURE_FILESYSTEM_ENTRY_miniIMFS) && \ - defined(CONFIGURE_FILESYSTEM_miniIMFS) + defined(CONFIGURE_FILESYSTEM_MINIIMFS) #define CONFIGURE_FILESYSTEM_ENTRY_miniIMFS \ { RTEMS_FILESYSTEM_TYPE_MINIIMFS, miniIMFS_initialize } #endif @@ -362,13 +362,13 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #endif /** - * NFSFS + * NFS */ - #if !defined(CONFIGURE_FILESYSTEM_ENTRY_NFSFS) && \ - defined(CONFIGURE_FILESYSTEM_NFSFS) + #if !defined(CONFIGURE_FILESYSTEM_ENTRY_NFS) && \ + defined(CONFIGURE_FILESYSTEM_NFS) #include <librtemsNfs.h> - #define CONFIGURE_FILESYSTEM_ENTRY_NFSFS \ - { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfsfs_initialize } + #define CONFIGURE_FILESYSTEM_ENTRY_NFS \ + { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfs_initialize } #endif #endif @@ -413,7 +413,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #endif #if defined(CONFIGURE_FILESYSTEM_IMFS) || \ - defined(CONFIGURE_FILESYSTEM_miniIMFS) + defined(CONFIGURE_FILESYSTEM_MINIIMFS) int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK; #endif @@ -428,7 +428,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #ifndef CONFIGURE_HAS_OWN_FILESYSTEM_TABLE const rtems_filesystem_table_t rtems_filesystem_table[] = { - #if defined(CONFIGURE_FILESYSTEM_miniIMFS) && \ + #if defined(CONFIGURE_FILESYSTEM_MINIIMFS) && \ defined(CONFIGURE_FILESYSTEM_ENTRY_miniIMFS) CONFIGURE_FILESYSTEM_ENTRY_miniIMFS, #endif @@ -448,9 +448,9 @@ rtems_fs_init_functions_t rtems_fs_init_helper = defined(CONFIGURE_FILESYSTEM_ENTRY_FTPFS) CONFIGURE_FILESYSTEM_ENTRY_FTPFS, #endif - #if defined(CONFIGURE_FILESYSTEM_NFSFS) && \ - defined(CONFIGURE_FILESYSTEM_ENTRY_NFSFS) - CONFIGURE_FILESYSTEM_ENTRY_NFSFS, + #if defined(CONFIGURE_FILESYSTEM_NFS) && \ + defined(CONFIGURE_FILESYSTEM_ENTRY_NFS) + CONFIGURE_FILESYSTEM_ENTRY_NFS, #endif #if defined(CONFIGURE_FILESYSTEM_DOSFS) && \ defined(CONFIGURE_FILESYSTEM_ENTRY_DOSFS) |