diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-14 15:44:44 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-14 15:44:44 +0000 |
commit | 8f7b8f7bb25f86b01e2e791534f08a47803bd960 (patch) | |
tree | d1929e6ffbec7445f13dbbcdfe6dd6b25a53716e /cpukit | |
parent | 2010-07-14 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-8f7b8f7bb25f86b01e2e791534f08a47803bd960.tar.bz2 |
2010-07-14 Joel Sherrill <joel.sherrill@oarcorp.com>
* libfs/Makefile.am: Remove reference to imfs_free.c,
wrapup/Makefile.am: Split devfs into its own library.
* libfs/src/imfs/fifoimfs_init.c, libfs/src/imfs/imfs.h,
libfs/src/imfs/imfs_init.c, libfs/src/rfs/rtems-rfs-rtems.c:
Use default freenode implementation.
* libfs/src/imfs/imfs_free.c: Removed.
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 9 | ||||
-rw-r--r-- | cpukit/libfs/Makefile.am | 42 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/fifoimfs_init.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/imfs.h | 8 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/imfs_free.c | 39 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/imfs_init.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-rtems.c | 16 | ||||
-rw-r--r-- | cpukit/wrapup/Makefile.am | 1 |
8 files changed, 35 insertions, 84 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1ccad80c5d..4432734a26 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,14 @@ 2010-07-14 Joel Sherrill <joel.sherrill@oarcorp.com> + * libfs/Makefile.am: Remove reference to imfs_free.c, + wrapup/Makefile.am: Split devfs into its own library. + * libfs/src/imfs/fifoimfs_init.c, libfs/src/imfs/imfs.h, + libfs/src/imfs/imfs_init.c, libfs/src/rfs/rtems-rfs-rtems.c: + Use default freenode implementation. + * libfs/src/imfs/imfs_free.c: Removed. + +2010-07-14 Joel Sherrill <joel.sherrill@oarcorp.com> + PR 1612/networking * ChangeLog, libcsupport/src/libio_sockets.c: Sockets need to have handlers in place. Null is no longer allowed. diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 340878a23e..416b5b8ad0 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -35,30 +35,32 @@ libdefaultfs_a_SOURCES = \ noinst_LIBRARIES += libimfs.a libimfs_a_SOURCES = -libimfs_a_SOURCES += src/imfs/imfs_chown.c src/imfs/imfs_config.c \ - src/imfs/imfs_creat.c src/imfs/imfs_directory.c src/imfs/imfs_eval.c \ - src/imfs/imfs_free.c src/imfs/imfs_fsunmount.c src/imfs/imfs_gtkn.c \ - src/imfs/imfs_init.c src/imfs/imfs_initsupp.c src/imfs/imfs_link.c \ - src/imfs/imfs_mknod.c src/imfs/imfs_mount.c src/imfs/imfs_fchmod.c \ - src/imfs/imfs_unlink.c src/imfs/imfs_unmount.c src/imfs/imfs_utime.c \ - src/imfs/imfs_ntype.c src/imfs/imfs_stat.c src/imfs/imfs_getchild.c \ - src/imfs/memfile.c src/imfs/imfs_fifo.c src/imfs/deviceio.c \ - src/imfs/imfs_handlers_device.c src/imfs/imfs_handlers_directory.c \ - src/imfs/imfs_handlers_link.c src/imfs/imfs_handlers_memfile.c \ - src/imfs/imfs_debug.c src/imfs/imfs_rmnod.c src/imfs/imfs_symlink.c \ - src/imfs/imfs_readlink.c src/imfs/imfs_fdatasync.c src/imfs/imfs_fcntl.c \ - src/imfs/ioman.c src/imfs/miniimfs_init.c src/imfs/imfs_load_tar.c \ - src/imfs/imfs_rename.c src/imfs/fifoimfs_init.c src/imfs/imfs.h \ - src/imfs/deviceerrno.c \ - src/devfs/devfs_init.c src/devfs/devfs_eval.c src/devfs/devfs_mknod.c \ - src/devfs/devfs_show.c src/devfs/devfs_node_type.c \ - src/devfs/devopen.c src/devfs/devread.c src/devfs/devwrite.c \ - src/devfs/devclose.c src/devfs/devioctl.c src/devfs/devstat.c \ - src/devfs/devfs.h +libimfs_a_SOURCES += src/imfs/deviceerrno.c src/imfs/deviceio.c \ + src/imfs/fifoimfs_init.c src/imfs/imfs_chown.c src/imfs/imfs_config.c \ + src/imfs/imfs_creat.c src/imfs/imfs_debug.c src/imfs/imfs_directory.c \ + src/imfs/imfs_eval.c src/imfs/imfs_fchmod.c src/imfs/imfs_fcntl.c \ + src/imfs/imfs_fdatasync.c src/imfs/imfs_fifo.c \ + src/imfs/imfs_fsunmount.c src/imfs/imfs_getchild.c \ + src/imfs/imfs_gtkn.c src/imfs/imfs_handlers_device.c \ + src/imfs/imfs_handlers_directory.c src/imfs/imfs_handlers_link.c \ + src/imfs/imfs_handlers_memfile.c src/imfs/imfs_init.c \ + src/imfs/imfs_initsupp.c src/imfs/imfs_link.c src/imfs/imfs_load_tar.c \ + src/imfs/imfs_mknod.c src/imfs/imfs_mount.c src/imfs/imfs_ntype.c \ + src/imfs/imfs_readlink.c src/imfs/imfs_rename.c src/imfs/imfs_rmnod.c \ + src/imfs/imfs_stat.c src/imfs/imfs_symlink.c src/imfs/imfs_unlink.c \ + src/imfs/imfs_unmount.c src/imfs/imfs_utime.c src/imfs/ioman.c \ + src/imfs/memfile.c src/imfs/miniimfs_init.c src/imfs/imfs.h # POSIX FIFO/pipe libimfs_a_SOURCES += src/pipe/fifo.c src/pipe/pipe.c src/pipe/pipe.h +noinst_LIBRARIES += libdevfs.a +libdevfs_a_SOURCES = src/devfs/devfs_init.c src/devfs/devfs_eval.c \ + src/devfs/devfs_mknod.c src/devfs/devfs_show.c \ + src/devfs/devfs_node_type.c src/devfs/devopen.c src/devfs/devread.c \ + src/devfs/devwrite.c src/devfs/devclose.c src/devfs/devioctl.c \ + src/devfs/devstat.c src/devfs/devfs.h + # dosfs if LIBDOSFS noinst_LIBRARIES += libdosfs.a diff --git a/cpukit/libfs/src/imfs/fifoimfs_init.c b/cpukit/libfs/src/imfs/fifoimfs_init.c index 6fa7b076ea..13dc373eec 100644 --- a/cpukit/libfs/src/imfs/fifoimfs_init.c +++ b/cpukit/libfs/src/imfs/fifoimfs_init.c @@ -33,7 +33,7 @@ const rtems_filesystem_operations_table fifoIMFS_ops = { .node_type_h = IMFS_node_type, .mknod_h = IMFS_mknod, .chown_h = IMFS_chown, - .freenod_h = IMFS_freenodinfo, + .freenod_h = rtems_filesystem_default_freenode, .mount_h = IMFS_mount, .fsmount_me_h = fifoIMFS_initialize, .unmount_h = IMFS_unmount, diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h index bb9b889116..808953054d 100644 --- a/cpukit/libfs/src/imfs/imfs.h +++ b/cpukit/libfs/src/imfs/imfs.h @@ -355,10 +355,6 @@ extern int IMFS_chown( gid_t group /* IN */ ); -extern int IMFS_freenodinfo( - rtems_filesystem_location_info_t *pathloc /* IN */ -); - extern int IMFS_mknod( const char *path, /* IN */ mode_t mode, /* IN */ @@ -396,10 +392,6 @@ extern int IMFS_unmount( rtems_filesystem_mount_table_entry_t *mt_entry /* IN */ ); -extern int IMFS_freenod( - rtems_filesystem_location_info_t *node /* IN/OUT */ -); - extern int IMFS_memfile_remove( IMFS_jnode_t *the_jnode /* IN/OUT */ ); diff --git a/cpukit/libfs/src/imfs/imfs_free.c b/cpukit/libfs/src/imfs/imfs_free.c deleted file mode 100644 index affbcaa044..0000000000 --- a/cpukit/libfs/src/imfs/imfs_free.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Free IMFS Node Support Routines - * - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include <errno.h> - -#include <rtems/libio_.h> -#include "imfs.h" - -/* - * IMFS_freenodinfo - * - * This routine is the IMFS free node handler for the file system - * operations table. - * - * The In Memory File System keeps its nodes in memory. This routine - * is for file sytems that do not. - */ - -int IMFS_freenodinfo( - rtems_filesystem_location_info_t *pathloc /* IN */ -) -{ - return 0; -} diff --git a/cpukit/libfs/src/imfs/imfs_init.c b/cpukit/libfs/src/imfs/imfs_init.c index 0631093043..3ba9511b8c 100644 --- a/cpukit/libfs/src/imfs/imfs_init.c +++ b/cpukit/libfs/src/imfs/imfs_init.c @@ -33,7 +33,7 @@ const rtems_filesystem_operations_table IMFS_ops = { .node_type_h = IMFS_node_type, .mknod_h = IMFS_mknod, .chown_h = IMFS_chown, - .freenod_h = IMFS_freenodinfo, + .freenod_h = rtems_filesystem_default_freenode, .mount_h = IMFS_mount, .fsmount_me_h = IMFS_initialize, .unmount_h = IMFS_unmount, diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c index 9c89cc5acd..e7a363639e 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c @@ -662,20 +662,6 @@ rtems_rfs_rtems_chown (rtems_filesystem_location_info_t *pathloc, } /** - * This routine is the RFS free node handler for the file system operations - * table. The RFS does not need to free anything. - * - * @param pathloc - * @retval 0 Always returned. - */ - -int -rtems_rfs_rtems_freenodinfo (rtems_filesystem_location_info_t* pathloc) -{ - return 0; -} - -/** * This routine is the implementation of the utime() system call for the * RFS. * @@ -1239,7 +1225,7 @@ const rtems_filesystem_operations_table rtems_rfs_ops = .node_type_h = rtems_rfs_rtems_node_type, .mknod_h = rtems_rfs_rtems_mknod, .chown_h = rtems_rfs_rtems_chown, - .freenod_h = rtems_rfs_rtems_freenodinfo, + .freenod_h = rtems_filesystem_default_freenode, .mount_h = rtems_filesystem_default_mount, .fsmount_me_h = rtems_rfs_rtems_initialise, .unmount_h = rtems_filesystem_default_unmount, diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 4622165fdd..b10acfac9b 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -28,6 +28,7 @@ if LIBDOSFS TMP_LIBS += ../libfs/libdosfs.a endif TMP_LIBS += ../libfs/libdefaultfs.a +TMP_LIBS += ../libfs/libdevfs.a TMP_LIBS += ../libfs/libimfs.a TMP_LIBS += ../libfs/librfs.a |