From 29e92b090c8bc35745aa5c89231ce806bcb11e57 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 31 May 2010 13:56:37 +0000 Subject: 2010-05-31 Chris Johns * libcsupport/Makefile.am: Add mount-mgr.c. * libcsupport/src/mount-mgr.c: New. * include/rtems/fs.h: Added rtems_filesystem_location_mount. * libcsupport/include/rtems/libio.h, libcsupport/src/mount.c: New mount interface. It is similar to Linux. * libcsupport/include/rtems/libio_.h: Remove the init_fs_mount_table call. * libcsupport/src/base_fs.c: Remove init_fs_mount_table_call. Use the new mount call. Remove setting the root node in the global pathloc. Mount does this now. * libcsupport/src/privateenv.c: Remove the hack to set the root mount table entry in the environment. * libcsupport/src/unmount.cL Free the target string. * libblock/src/bdpart-mount.c: New mount API. * libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_init.c, libfs/src/dosfs/dosfs.h, libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_init.c, libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c, libfs/src/imfs/imfs_init.c, libfs/src/imfs/miniimfs_init.c, libfs/src/nfsclient/src/librtemsNfs.h, libfs/src/rfs/rtems-rfs-rtems.c, libfs/src/rfs/rtems-rfs.h, libnetworking/lib/ftpfs.c, libnetworking/rtems/ftpfs.h, libnetworking/rtems/tftp.h: New mount_h API. * libfs/src/devfs/devfs_eval.c: Local include of extern ops. * libfs/src/nfsclient/src/nfs.c: New mount API. Removed the mount me call and fixed the initialisation to happen when mounting. * libmisc/Makefile.am, libmisc/shell/shellconfig.h: Remove mount filesystem files. * libmisc/fsmount/fsmount.c, libmisc/fsmount/fsmount.h: Updated to the new mount table values. * libmisc/shell/main_mount_ftp.c, libmisc/shell/main_mount_msdos.c, libmisc/shell/main_mount_rfs.c, libmisc/shell/main_mount_tftp.c: Removed. * libmisc/shell/main_mount.c: Use the new mount API. Also access the file system table for the file system types. * libnetworking/lib/tftpDriver.c: Updated to the new mount API. Fixed to allow mounting from any mount point. Also can now have more than file system mounted. * sapi/include/confdefs.h: Add file system configuration support. --- cpukit/libmisc/shell/shellconfig.h | 39 -------------------------------------- 1 file changed, 39 deletions(-) (limited to 'cpukit/libmisc/shell/shellconfig.h') diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h index 65428ea164..cfc475095e 100644 --- a/cpukit/libmisc/shell/shellconfig.h +++ b/cpukit/libmisc/shell/shellconfig.h @@ -91,17 +91,6 @@ extern rtems_shell_alias_t rtems_shell_EXIT_Alias; extern rtems_shell_alias_t *rtems_shell_Initial_aliases[]; -/* - * Externs for mount command helpers - */ -extern rtems_shell_filesystems_t rtems_shell_Mount_RFS; -extern rtems_shell_filesystems_t rtems_shell_Mount_MSDOS; -extern rtems_shell_filesystems_t rtems_shell_Mount_TFTP; -extern rtems_shell_filesystems_t rtems_shell_Mount_FTP; -extern rtems_shell_filesystems_t rtems_shell_Mount_NFS; - -extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[]; - /* * If we are configured to alias a command, then make sure the underlying * command is configured. @@ -444,34 +433,6 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[]; NULL }; - /* - * The mount command's support file system types. - */ - #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ - !defined(CONFIGURE_SHELL_COMMAND_NO_MOUNT)) || \ - defined(CONFIGURE_SHELL_COMMAND_MOUNT) - rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[] = { - #if defined(CONFIGURE_SHELL_MOUNT_RFS) - &rtems_shell_Mount_RFS, - #endif - #if defined(CONFIGURE_SHELL_MOUNT_MSDOS) - &rtems_shell_Mount_MSDOS, - #endif - #if RTEMS_NETWORKING - #if defined(CONFIGURE_SHELL_MOUNT_TFTP) - &rtems_shell_Mount_TFTP, - #endif - #if defined(CONFIGURE_SHELL_MOUNT_FTP) - &rtems_shell_Mount_FTP, - #endif - #if defined(CONFIGURE_SHELL_MOUNT_NFS) - &rtems_shell_Mount_NFS, - #endif - #endif - NULL - }; - #endif - #endif #endif -- cgit v1.2.3