Changeset b5e68c8 in mainline for contrib/arch/uspace/srv/vfs/vfs.adl


Ignore:
Timestamp:
2011-05-12T16:49:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f36787d7
Parents:
e80329d6 (diff), 750636a (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/arch/uspace/srv/vfs/vfs.adl

    re80329d6 rb5e68c8  
    11interface vfs extends service {
    22                /* Register a filesystem driver */
    3                 ipcarg_t register(in_copy string name);
     3                sysarg_t register(in_copy string name);
    44               
    55                /* Mount filesystem */
    6                 ipcarg_t mount(in ipcarg_t device, in ipcarg_t flags, in_copy string point, in_copy string opts, in_copy string fs);
     6                sysarg_t mount(in sysarg_t device, in sysarg_t flags, in_copy string point, in_copy string opts, in_copy string fs);
    77               
    88                /* Open file */
    9                 ipcarg_t open(in ipcarg_t lflag, in ipcarg_t oflag, in ipcarg_t mode, in_copy string path, out ipcarg_t fd);
     9                sysarg_t open(in sysarg_t lflag, in sysarg_t oflag, in sysarg_t mode, in_copy string path, out sysarg_t fd);
    1010               
    1111                /* Open file using node */
    12                 ipcarg_t open_node(in ipcarg_t fs_handle, in ipcarg_t dev_handle, in ipcarg_t index, in ipcarg_t oflag, out ipcarg_t fd);
     12                sysarg_t open_node(in sysarg_t fs_handle, in sysarg_t dev_handle, in sysarg_t index, in sysarg_t oflag, out sysarg_t fd);
    1313               
    1414                /* Read data from file */
    15                 ipcarg_t read(in ipcarg_t fd, out_copy stream data);
     15                sysarg_t read(in sysarg_t fd, out_copy stream data);
    1616               
    1717                /* Write data to file */
    18                 ipcarg_t write(in ipcarg_t fd, in_copy stream data);
     18                sysarg_t write(in sysarg_t fd, in_copy stream data);
    1919               
    2020                /* Seek in file */
    21                 ipcarg_t seek(in ipcarg_t fd, in ipcarg_t offset, in ipcarg_t whence);
     21                sysarg_t seek(in sysarg_t fd, in sysarg_t offset, in sysarg_t whence);
    2222               
    2323                /* Truncate file */
    24                 ipcarg_t truncate(in ipcarg_t fd, in ipcarg_t size);
     24                sysarg_t truncate(in sysarg_t fd, in sysarg_t size);
    2525               
    2626                /* Get file metadata */
    27                 ipcarg_t fstat(in ipcarg_t fd, out_copy stream stat);
     27                sysarg_t fstat(in sysarg_t fd, out_copy stream stat);
    2828               
    2929                /* Get directory entry metadata */
    30                 ipcarg_t stat(in_copy string path, out_copy stream stat);
     30                sysarg_t stat(in_copy string path, out_copy stream stat);
    3131               
    3232                /* Create directory */
    33                 ipcarg_t mkdir(in ipcarg_t mode, in_copy string path);
     33                sysarg_t mkdir(in sysarg_t mode, in_copy string path);
    3434               
    3535                /* Delete directory entry */
    36                 ipcarg_t unlink(in ipcarg_t lflag, in_copy string path);
     36                sysarg_t unlink(in sysarg_t lflag, in_copy string path);
    3737               
    3838                /* Rename directory entry */
    39                 ipcarg_t rename(in_copy string old, in_copy string new);
     39                sysarg_t rename(in_copy string old, in_copy string new);
    4040               
    4141                /* Flush file buffers */
    42                 ipcarg_t sync(in ipcarg_t fd);
     42                sysarg_t sync(in sysarg_t fd);
    4343               
    4444                /* In-protocol status value */
    45                 ipcarg_t ipc_m_ping(void);
     45                sysarg_t ipc_m_ping(void);
    4646               
    4747                /* Close connection */
    48                 ipcarg_t ipc_m_phone_hungup(void);
     48                sysarg_t ipc_m_phone_hungup(void);
    4949        protocol:
    5050                [vfs.bp]
    … …  
    5353interface fs extends service {
    5454                /* Notify filesystem that it was mounted */
    55                 ipcarg_t mounted(in ipcarg_t dev_handle, in_copy string opts);
     55                sysarg_t mounted(in sysarg_t dev_handle, in_copy string opts);
    5656               
    5757                /* Mount filesystem */
    58                 ipcarg_t mount(in ipcarg_t device, in ipcarg_t flags, in_copy string point, in_copy string opts, ...);
     58                sysarg_t mount(in sysarg_t device, in sysarg_t flags, in_copy string point, in_copy string opts, ...);
    5959               
    6060                /* Open file by node */
    61                 ipcarg_t open_node(in ipcarg_t lflag, in ipcarg_t oflag, in ipcarg_t mode, ...);
     61                sysarg_t open_node(in sysarg_t lflag, in sysarg_t oflag, in sysarg_t mode, ...);
    6262               
    6363                /* Lookup file */
    64                 ipcarg_t lookup(in ipcarg_t lflag, in ipcarg_t oflag, in ipcarg_t mode, ...);
     64                sysarg_t lookup(in sysarg_t lflag, in sysarg_t oflag, in sysarg_t mode, ...);
    6565               
    6666                /* Read data from file */
    67                 ipcarg_t read(in ipcarg_t dev_handle, in ipcarg_t fs_index, in ipcarg_t offset, out_copy stream data);
     67                sysarg_t read(in sysarg_t dev_handle, in sysarg_t fs_index, in sysarg_t offset, out_copy stream data);
    6868               
    6969                /* Write data to file */
    70                 ipcarg_t write(in ipcarg_t dev_handle, in ipcarg_t fs_index, in ipcarg_t offset, in_copy stream data);
     70                sysarg_t write(in sysarg_t dev_handle, in sysarg_t fs_index, in sysarg_t offset, in_copy stream data);
    7171               
    7272                /* Truncate file */
    73                 ipcarg_t truncate(in ipcarg_t dev_handle, in ipcarg_t fs_index, in ipcarg_t size);
     73                sysarg_t truncate(in sysarg_t dev_handle, in sysarg_t fs_index, in sysarg_t size);
    7474               
    7575                /* Get directory entry metadata */
    76                 ipcarg_t stat(in ipcarg_t dev_handle, in ipcarg_t fs_index, out_copy stream stat);
     76                sysarg_t stat(in sysarg_t dev_handle, in sysarg_t fs_index, out_copy stream stat);
    7777               
    7878                /* Flush file buffers */
    79                 ipcarg_t sync(in ipcarg_t dev_handle, in ipcarg_t fs_index);
     79                sysarg_t sync(in sysarg_t dev_handle, in sysarg_t fs_index);
    8080               
    8181                /* Notify on file close */
    82                 ipcarg_t close(in ipcarg_t dev_handle, in ipcarg_t fs_index);
     82                sysarg_t close(in sysarg_t dev_handle, in sysarg_t fs_index);
    8383};
    8484
Note: See TracChangeset for help on using the changeset viewer.