Ignore:
Timestamp:
May 15, 2012, 8:06:18 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1c0263c
Parents:
d5d071d (diff), da154e14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libcsupport/include/rtems/libio.h

    rd5d071d ra7d1992c  
    7070 */
    7171typedef void (*rtems_filesystem_mt_entry_lock_t)(
    72   rtems_filesystem_mount_table_entry_t *mt_entry
     72  const rtems_filesystem_mount_table_entry_t *mt_entry
    7373);
    7474
     
    8181 */
    8282typedef void (*rtems_filesystem_mt_entry_unlock_t)(
    83   rtems_filesystem_mount_table_entry_t *mt_entry
     83  const rtems_filesystem_mount_table_entry_t *mt_entry
    8484);
    8585
     
    524524 */
    525525void rtems_filesystem_default_lock(
    526   rtems_filesystem_mount_table_entry_t *mt_entry
     526  const rtems_filesystem_mount_table_entry_t *mt_entry
    527527);
    528528
     
    533533 */
    534534void rtems_filesystem_default_unlock(
    535   rtems_filesystem_mount_table_entry_t *mt_entry
     535  const rtems_filesystem_mount_table_entry_t *mt_entry
    536536);
    537537
     
    787787 * @brief Reads from a node.
    788788 *
     789 * This handler is responsible to update the offset field of the IO descriptor.
     790 *
    789791 * @param[in, out] iop The IO pointer.
    790792 * @param[out] buffer The buffer for read data.
     
    805807 * @brief Writes to a node.
    806808 *
     809 * This handler is responsible to update the offset field of the IO descriptor.
     810 *
    807811 * @param[in, out] iop The IO pointer.
    808812 * @param[out] buffer The buffer for write data.
     
    833837 */
    834838typedef int (*rtems_filesystem_ioctl_t)(
    835   rtems_libio_t *iop,
    836   uint32_t       request,
    837   void          *buffer
     839  rtems_libio_t   *iop,
     840  ioctl_command_t  request,
     841  void            *buffer
    838842);
    839843
     
    10091013 */
    10101014int rtems_filesystem_default_ioctl(
    1011   rtems_libio_t *iop,
    1012   uint32_t       command,
    1013   void          *buffer
     1015  rtems_libio_t   *iop,
     1016  ioctl_command_t  request,
     1017  void            *buffer
    10141018);
    10151019
     
    10631067  off_t offset,
    10641068  int whence
    1065 );
    1066 
    1067 /**
    1068  * @retval 0 Always.
    1069  *
    1070  * @see rtems_filesystem_lseek_t.
    1071  */
    1072 off_t rtems_filesystem_default_lseek_file(
    1073   rtems_libio_t *iop,
    1074   off_t          offset,
    1075   int            whence
    10761069);
    10771070
     
    12371230typedef struct {
    12381231  rtems_libio_t          *iop;
    1239   uint32_t                command;
     1232  ioctl_command_t         command;
    12401233  void                   *buffer;
    12411234  int                     ioctl_return;
     
    14391432struct rtems_filesystem_mount_table_entry_tt {
    14401433  rtems_chain_node                       mt_node;
     1434  void                                  *fs_info;
     1435  const rtems_filesystem_operations_table *ops;
     1436  const void                            *immutable_fs_info;
    14411437  rtems_chain_control                    location_chain;
    14421438  rtems_filesystem_global_location_t    *mt_point_node;
     
    14441440  bool                                   mounted;
    14451441  bool                                   writeable;
    1446   void                                  *fs_info;
    1447   const void                            *immutable_fs_info;
    14481442  rtems_filesystem_limits_and_options_t  pathconf_limits_and_options;
    14491443
Note: See TracChangeset for help on using the changeset viewer.