4 files changed, 6 insertions, 30 deletions
diff --git a/c/src/exec/libcsupport/src/Makefile.am b/c/src/exec/libcsupport/src/Makefile.am
index 5861b049fa..72447d2094 100644
--- a/c/src/exec/libcsupport/src/Makefile.am
+++ b/c/src/exec/libcsupport/src/Makefile.am
@@ -11,7 +11,7 @@ ERROR_C_FILES = error.c
 
 ASSOCIATION_C_FILES = assoc.c assocnamebad.c
 
-BASE_FS_C_FILES = base_fs.c mount.c unmount.c ioman.c libio.c \
+BASE_FS_C_FILES = base_fs.c mount.c unmount.c libio.c \
     libio_sockets.c eval.c fs_null_handlers.c
 
 TERMIOS_C_FILES = cfgetispeed.c cfgetospeed.c cfsetispeed.c cfsetospeed.c \
diff --git a/c/src/exec/libcsupport/src/base_fs.c b/c/src/exec/libcsupport/src/base_fs.c
index 3ea1abd7aa..fb932b542d 100644
--- a/c/src/exec/libcsupport/src/base_fs.c
+++ b/c/src/exec/libcsupport/src/base_fs.c
@@ -13,7 +13,6 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#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/c/src/exec/libcsupport/src/mount.c b/c/src/exec/libcsupport/src/mount.c
index f5861099f6..253735b9fc 100644
--- a/c/src/exec/libcsupport/src/mount.c
+++ b/c/src/exec/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/c/src/exec/libcsupport/src/unmount.c b/c/src/exec/libcsupport/src/unmount.c
index 565fa5f8d8..17f7e4baa2 100644
--- a/c/src/exec/libcsupport/src/unmount.c
+++ b/c/src/exec/libcsupport/src/unmount.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <assert.h>
 
-#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 ) {