Changeset de39b51 in rtems


Ignore:
Timestamp:
Jul 15, 2010, 8:46:06 AM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
f4dea06
Parents:
fd2b1634
Message:

2010-07-16 Sebastian Huber <sebastian.huber@…>

  • libcsupport/include/rtems/libio_.h: Removed rtems_filesystem_null_handlers.
  • libcsupport/src/fs_null_handlers.c: Removed file.
  • libcsupport/Makefile.am: Reflect change above.
  • libfs/src/nfsclient/src/nfs.c, libfs/src/imfs/imfs_creat.c, libfs/src/imfs/imfs_init.c, libfs/src/imfs/miniimfs_init.c: Use rtems_filesystem_handlers_default instead of rtems_filesystem_null_handlers.
  • libnetworking/lib/ftpfs.c, libnetworking/lib/tftpDriver.c: Initialize handler and operations table with proper defaults.
Location:
cpukit
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rfd2b1634 rde39b51  
     12010-07-16      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * libcsupport/include/rtems/libio_.h: Removed rtems_filesystem_null_handlers.
     4        * libcsupport/src/fs_null_handlers.c: Removed file.
     5        * libcsupport/Makefile.am: Reflect change above.
     6        * libfs/src/nfsclient/src/nfs.c, libfs/src/imfs/imfs_creat.c,
     7        libfs/src/imfs/imfs_init.c, libfs/src/imfs/miniimfs_init.c: Use
     8        rtems_filesystem_handlers_default instead of
     9        rtems_filesystem_null_handlers.
     10        * libnetworking/lib/ftpfs.c, libnetworking/lib/tftpDriver.c:
     11        Initialize handler and operations table with proper defaults.
     12
    1132010-07-16      Sebastian Huber <sebastian.huber@embedded-brains.de>
    214
  • cpukit/libcsupport/Makefile.am

    rfd2b1634 rde39b51  
    4646BASE_FS_C_FILES = src/base_fs.c src/mount.c src/unmount.c src/libio.c \
    4747    src/mount-mgr.c src/mount-mktgt.c src/libio_init.c \
    48     src/eval.c src/fs_null_handlers.c src/privateenv.c \
     48    src/eval.c src/privateenv.c \
    4949    src/open_dev_console.c src/__usrenv.c src/rtems_mkdir.c
    5050
  • cpukit/libcsupport/include/rtems/libio_.h

    rfd2b1634 rde39b51  
    3838
    3939extern rtems_id                          rtems_libio_semaphore;
    40 extern const rtems_filesystem_file_handlers_r rtems_filesystem_null_handlers;
    4140
    4241/*
  • cpukit/libfs/src/imfs/imfs_creat.c

    rfd2b1634 rde39b51  
    5555   */
    5656  if ( type == IMFS_FIFO &&
    57        fs_info->fifo_handlers == &rtems_filesystem_null_handlers )
     57       fs_info->fifo_handlers == &rtems_filesystem_handlers_default )
    5858    return NULL;
    5959
  • cpukit/libfs/src/imfs/imfs_init.c

    rfd2b1634 rde39b51  
    5757    &IMFS_memfile_handlers,
    5858    &IMFS_directory_handlers,
    59     &rtems_filesystem_null_handlers  /* for fifos */
     59    &rtems_filesystem_handlers_default  /* for fifos */
    6060  );
    6161}
  • cpukit/libfs/src/imfs/miniimfs_init.c

    rfd2b1634 rde39b51  
    5555    mt_entry,
    5656    &miniIMFS_ops,
    57     &rtems_filesystem_null_handlers, /* for memfiles */
    58     &rtems_filesystem_null_handlers, /* for directories */
    59     &rtems_filesystem_null_handlers  /* for fifos */
     57    &rtems_filesystem_handlers_default, /* for memfiles */
     58    &rtems_filesystem_handlers_default, /* for directories */
     59    &rtems_filesystem_handlers_default  /* for fifos */
    6060  );
    6161}
  • cpukit/libfs/src/nfsclient/src/nfs.c

    rfd2b1634 rde39b51  
    16171617                        case NFREG:     pathloc->handlers = &nfs_file_file_handlers; break;
    16181618                        case NFLNK: pathloc->handlers = &nfs_link_file_handlers; break;
    1619                         default:        pathloc->handlers = &rtems_filesystem_null_handlers; break;
     1619                        default:        pathloc->handlers = &rtems_filesystem_handlers_default; break;
    16201620                }
    16211621                pathloc->node_access = node;
  • cpukit/libnetworking/lib/ftpfs.c

    rfd2b1634 rde39b51  
    12931293static const rtems_filesystem_operations_table rtems_ftpfs_ops = {
    12941294  .evalpath_h = rtems_ftpfs_eval_path,
    1295   .evalformake_h = NULL,
    1296   .link_h = NULL,
    1297   .unlink_h = NULL,
     1295  .evalformake_h = rtems_filesystem_default_evalformake,
     1296  .link_h = rtems_filesystem_default_link,
     1297  .unlink_h = rtems_filesystem_default_unlink,
    12981298  .node_type_h = rtems_ftpfs_node_type,
    1299   .mknod_h = NULL,
    1300   .chown_h = NULL,
     1299  .mknod_h = rtems_filesystem_default_mknod,
     1300  .chown_h = rtems_filesystem_default_chown,
    13011301  .freenod_h = rtems_ftpfs_free_node,
    1302   .mount_h = NULL,
     1302  .mount_h = rtems_filesystem_default_mount,
    13031303  .fsmount_me_h = rtems_ftpfs_initialize,
    1304   .unmount_h = NULL,
     1304  .unmount_h = rtems_filesystem_default_unmount,
    13051305  .fsunmount_me_h = rtems_ftpfs_unmount_me,
    1306   .utime_h = NULL,
    1307   .eval_link_h = NULL,
    1308   .symlink_h = NULL,
    1309   .readlink_h = NULL
     1306  .utime_h = rtems_filesystem_default_utime,
     1307  .eval_link_h = rtems_filesystem_default_evaluate_link,
     1308  .symlink_h = rtems_filesystem_default_symlink,
     1309  .readlink_h = rtems_filesystem_default_readlink
    13101310};
    13111311
     
    13151315  .read_h = rtems_ftpfs_read,
    13161316  .write_h = rtems_ftpfs_write,
    1317   .ioctl_h = NULL,
    1318   .lseek_h = NULL,
     1317  .ioctl_h = rtems_filesystem_default_ioctl,
     1318  .lseek_h = rtems_filesystem_default_lseek,
    13191319  .fstat_h = rtems_ftpfs_fstat,
    1320   .fchmod_h = NULL,
     1320  .fchmod_h = rtems_filesystem_default_fchmod,
    13211321  .ftruncate_h = rtems_ftpfs_ftruncate,
    1322   .fpathconf_h = NULL,
    1323   .fsync_h = NULL,
    1324   .fdatasync_h = NULL,
    1325   .fcntl_h = NULL,
    1326   .rmnod_h = NULL
     1322  .fpathconf_h = rtems_filesystem_default_fpathconf,
     1323  .fsync_h = rtems_filesystem_default_fsync,
     1324  .fdatasync_h = rtems_filesystem_default_fdatasync,
     1325  .fcntl_h = rtems_filesystem_default_fcntl,
     1326  .rmnod_h = rtems_filesystem_default_rmnod
    13271327};
    13281328
    13291329static const rtems_filesystem_file_handlers_r rtems_ftpfs_root_handlers = {
    1330   .open_h = NULL,
    1331   .close_h = NULL,
    1332   .read_h = NULL,
    1333   .write_h = NULL,
     1330  .open_h = rtems_filesystem_default_open,
     1331  .close_h = rtems_filesystem_default_close,
     1332  .read_h = rtems_filesystem_default_read,
     1333  .write_h = rtems_filesystem_default_write,
    13341334  .ioctl_h = rtems_ftpfs_ioctl,
    1335   .lseek_h = NULL,
    1336   .fstat_h = NULL,
    1337   .fchmod_h = NULL,
    1338   .ftruncate_h = NULL,
    1339   .fpathconf_h = NULL,
    1340   .fsync_h = NULL,
    1341   .fdatasync_h = NULL,
    1342   .fcntl_h = NULL,
    1343   .rmnod_h = NULL
     1335  .lseek_h = rtems_filesystem_default_lseek,
     1336  .fstat_h = rtems_filesystem_default_fstat,
     1337  .fchmod_h = rtems_filesystem_default_fchmod,
     1338  .ftruncate_h = rtems_filesystem_default_ftruncate,
     1339  .fpathconf_h = rtems_filesystem_default_fpathconf,
     1340  .fsync_h = rtems_filesystem_default_fsync,
     1341  .fdatasync_h = rtems_filesystem_default_fdatasync,
     1342  .fcntl_h = rtems_filesystem_default_fcntl,
     1343  .rmnod_h = rtems_filesystem_default_rmnod
    13441344};
  • cpukit/libnetworking/lib/tftpDriver.c

    rfd2b1634 rde39b51  
    10841084
    10851085static const rtems_filesystem_operations_table  rtems_tftp_ops = {
    1086     rtems_tftp_eval_path,            /* eval_path */
    1087     rtems_tftp_evaluate_for_make,    /* evaluate_for_make */
    1088     NULL,                            /* link */
    1089     NULL,                            /* unlink */
    1090     rtems_tftp_node_type,            /* node_type */
    1091     NULL,                            /* mknod */
    1092     NULL,                            /* chown */
    1093     rtems_tftp_free_node_info,       /* freenodinfo */
    1094     NULL,                            /* mount */
    1095     rtems_tftpfs_initialize,         /* initialize */
    1096     NULL,                            /* unmount */
    1097     rtems_tftpfs_shutdown,           /* fsunmount */
    1098     NULL,                            /* utime, */
    1099     NULL,                            /* evaluate_link */
    1100     NULL,                            /* symlink */
    1101     NULL,                            /* readlin */
     1086    .evalpath_h = rtems_tftp_eval_path,
     1087    .evalformake_h = rtems_tftp_evaluate_for_make,
     1088    .link_h = rtems_filesystem_default_link,
     1089    .unlink_h = rtems_filesystem_default_unlink,
     1090    .node_type_h = rtems_tftp_node_type,
     1091    .mknod_h = rtems_filesystem_default_mknod,
     1092    .chown_h = rtems_filesystem_default_chown,
     1093    .freenod_h = rtems_tftp_free_node_info,
     1094    .mount_h = rtems_filesystem_default_mount,
     1095    .fsmount_me_h = rtems_tftpfs_initialize,
     1096    .unmount_h = rtems_filesystem_default_unmount,
     1097    .fsunmount_me_h = rtems_tftpfs_shutdown,
     1098    .utime_h = rtems_filesystem_default_utime,
     1099    .eval_link_h = rtems_filesystem_default_evaluate_link,
     1100    .symlink_h = rtems_filesystem_default_symlink,
     1101    .readlink_h = rtems_filesystem_default_readlink
    11021102};
    11031103
    11041104static const rtems_filesystem_file_handlers_r rtems_tftp_handlers = {
    1105     rtems_tftp_open,      /* open */
    1106     rtems_tftp_close,     /* close */
    1107     rtems_tftp_read,      /* read */
    1108     rtems_tftp_write,     /* write */
    1109     NULL,                 /* ioctl */
    1110     NULL,                 /* lseek */
    1111     NULL,                 /* fstat */
    1112     NULL,                 /* fchmod */
    1113     rtems_tftp_ftruncate, /* ftruncate */
    1114     NULL,                 /* fpathconf */
    1115     NULL,                 /* fsync */
    1116     NULL,                 /* fdatasync */
    1117     NULL,                 /* fcntl */
    1118     NULL                  /* rmnod */
     1105   .open_h = rtems_tftp_open,
     1106   .close_h = rtems_tftp_close,
     1107   .read_h = rtems_tftp_read,
     1108   .write_h = rtems_tftp_write,
     1109   .ioctl_h = rtems_filesystem_default_ioctl,
     1110   .lseek_h = rtems_filesystem_default_lseek,
     1111   .fstat_h = rtems_filesystem_default_fstat,
     1112   .fchmod_h = rtems_filesystem_default_fchmod,
     1113   .ftruncate_h = rtems_tftp_ftruncate,
     1114   .fpathconf_h = rtems_filesystem_default_fpathconf,
     1115   .fsync_h = rtems_filesystem_default_fsync,
     1116   .fdatasync_h = rtems_filesystem_default_fdatasync,
     1117   .fcntl_h = rtems_filesystem_default_fcntl,
     1118   .rmnod_h = rtems_filesystem_default_rmnod
    11191119};
Note: See TracChangeset for help on using the changeset viewer.