From 7b0001f79554baacc7ae8470ec137d09ddb71cb1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 25 Oct 2000 16:56:11 +0000 Subject: 2000-10-24 Joel Sherrill * libc/ioman.c: Moved to libfs. * libc/Makefile.am: Removed ioman.c as part of moving it to libfs. * libc/base_fs.c: Removed include of imfs.h and reworded comment to avoid being IMFS specific. * libc/libio.h: Removed prototype of IMFS_ops since it should not be in this file. * libc/mount.c: Removed IMFS specific configuration information. * libc/unmount.c: Removed include of imfs.h and reworded comment to avoid being IMFS specific. --- cpukit/libcsupport/include/rtems/libio.h | 4 ---- cpukit/libcsupport/src/base_fs.c | 7 ++++--- cpukit/libcsupport/src/mount.c | 22 +--------------------- cpukit/libcsupport/src/unmount.c | 5 ----- 4 files changed, 5 insertions(+), 33 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index 6bd626bc5a..1d4a2621d4 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -267,10 +267,6 @@ typedef struct { rtems_filesystem_readlink_t readlink_h; } rtems_filesystem_operations_table; -#define IMFS_FILE_SYSTEM IMFS_ops -extern rtems_filesystem_operations_table IMFS_ops; - - /* * Structure used to determine a location/filesystem in the tree. */ diff --git a/cpukit/libcsupport/src/base_fs.c b/cpukit/libcsupport/src/base_fs.c index 3ea1abd7aa..fb932b542d 100644 --- a/cpukit/libcsupport/src/base_fs.c +++ b/cpukit/libcsupport/src/base_fs.c @@ -13,7 +13,6 @@ #include #include -#include "imfs.h" #include "libio_.h" /* @@ -33,8 +32,10 @@ mode_t rtems_filesystem_umask; /* * rtems_filesystem_initialize * - * Initialize the foundation of the file system with one instantiation - * of the IMFS with a single "/dev" directory in it. + * Initialize the foundation of the file system. This is specified + * by the structure rtems_filesystem_mount_table. The usual + * configuration is a single instantiation of the IMFS or miniIMFS with + * a single "/dev" directory in it. */ void rtems_filesystem_initialize( void ) diff --git a/cpukit/libcsupport/src/mount.c b/cpukit/libcsupport/src/mount.c index f5861099f6..253735b9fc 100644 --- a/cpukit/libcsupport/src/mount.c +++ b/cpukit/libcsupport/src/mount.c @@ -31,28 +31,8 @@ Chain_Control rtems_filesystem_mount_table_control; -#include "imfs.h" - -/* XXX this structure should be in an IMFS specific file */ -/* XXX this structure should use real constants */ - -rtems_filesystem_limits_and_options_t IMFS_LIMITS_AND_OPTIONS = { - 5, /* link_max */ - 6, /* max_canon */ - 7, /* max_input */ - IMFS_NAME_MAX, /* name_max */ - 255, /* path_max */ - 2, /* pipe_buf */ - 1, /* posix_async_io */ - 2, /* posix_chown_restrictions */ - 3, /* posix_no_trunc */ - 4, /* posix_prio_io */ - 5, /* posix_sync_io */ - 6 /* posix_vdisable */ -}; - /* - * XXX + * Prototypes that probably should be somewhere else. */ int search_mt_for_mount_point( diff --git a/cpukit/libcsupport/src/unmount.c b/cpukit/libcsupport/src/unmount.c index 565fa5f8d8..17f7e4baa2 100644 --- a/cpukit/libcsupport/src/unmount.c +++ b/cpukit/libcsupport/src/unmount.c @@ -26,7 +26,6 @@ #include #include -#include "imfs.h" #include "libio_.h" /* @@ -99,10 +98,6 @@ int unmount( /* * Allow the file system being mounted on to do its cleanup. - * XXX - Did I change these correctly ??? It looks like either I did - * XXX this backwards or the IMFS_unmount and IMFS_fsumount are swapped. - * XXX Add to the mt_point_node unmount to set the mt_entry back to null - * XXX I will step off in space when evaluating past the end of the node. */ if ((temp_mt_entry.mt_point_node.ops->unmount_h )( temp_loc.mt_entry ) != 0 ) { -- cgit v1.2.3