Changeset 3be9d10 in mainline for uspace/srv/vfs/vfs_ipc.c


Ignore:
Timestamp:
2018-03-21T21:29:31Z (6 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3e242d2
Parents:
eadaeae8
Message:

Get rid of ipc_callid_t

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/vfs/vfs_ipc.c

    readaeae8 r3be9d10  
    3535#include <vfs/canonify.h>
    3636
    37 static void vfs_in_clone(ipc_callid_t rid, ipc_call_t *request)
     37static void vfs_in_clone(cap_call_handle_t rid, ipc_call_t *request)
    3838{
    3939        int oldfd = IPC_GET_ARG1(*request);
    … …  
    4646}
    4747
    48 static void vfs_in_fsprobe(ipc_callid_t rid, ipc_call_t *request)
     48static void vfs_in_fsprobe(cap_call_handle_t rid, ipc_call_t *request)
    4949{
    5050        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
    5151        char *fs_name = NULL;
    52         ipc_callid_t callid;
     52        cap_call_handle_t callid;
    5353        vfs_fs_probe_info_t info;
    5454        size_t len;
    … …  
    8383}
    8484
    85 static void vfs_in_fstypes(ipc_callid_t rid, ipc_call_t *request)
    86 {
    87         ipc_callid_t callid;
     85static void vfs_in_fstypes(cap_call_handle_t rid, ipc_call_t *request)
     86{
     87        cap_call_handle_t callid;
    8888        size_t len;
    8989        vfs_fstypes_t fstypes;
    … …  
    111111}
    112112
    113 static void vfs_in_mount(ipc_callid_t rid, ipc_call_t *request)
     113static void vfs_in_mount(cap_call_handle_t rid, ipc_call_t *request)
    114114{
    115115        int mpfd = IPC_GET_ARG1(*request);
    … …  
    156156}
    157157
    158 static void vfs_in_open(ipc_callid_t rid, ipc_call_t *request)
     158static void vfs_in_open(cap_call_handle_t rid, ipc_call_t *request)
    159159{
    160160        int fd = IPC_GET_ARG1(*request);
    … …  
    165165}
    166166
    167 static void vfs_in_put(ipc_callid_t rid, ipc_call_t *request)
     167static void vfs_in_put(cap_call_handle_t rid, ipc_call_t *request)
    168168{
    169169        int fd = IPC_GET_ARG1(*request);
    … …  
    172172}
    173173
    174 static void vfs_in_read(ipc_callid_t rid, ipc_call_t *request)
     174static void vfs_in_read(cap_call_handle_t rid, ipc_call_t *request)
    175175{
    176176        int fd = IPC_GET_ARG1(*request);
    … …  
    183183}
    184184
    185 static void vfs_in_rename(ipc_callid_t rid, ipc_call_t *request)
     185static void vfs_in_rename(cap_call_handle_t rid, ipc_call_t *request)
    186186{
    187187        /* The common base directory. */
    … …  
    227227}
    228228
    229 static void vfs_in_resize(ipc_callid_t rid, ipc_call_t *request)
     229static void vfs_in_resize(cap_call_handle_t rid, ipc_call_t *request)
    230230{
    231231        int fd = IPC_GET_ARG1(*request);
    … …  
    235235}
    236236
    237 static void vfs_in_stat(ipc_callid_t rid, ipc_call_t *request)
     237static void vfs_in_stat(cap_call_handle_t rid, ipc_call_t *request)
    238238{
    239239        int fd = IPC_GET_ARG1(*request);
    … …  
    242242}
    243243
    244 static void vfs_in_statfs(ipc_callid_t rid, ipc_call_t *request)
     244static void vfs_in_statfs(cap_call_handle_t rid, ipc_call_t *request)
    245245{
    246246        int fd = (int) IPC_GET_ARG1(*request);
    … …  
    250250}
    251251
    252 static void vfs_in_sync(ipc_callid_t rid, ipc_call_t *request)
     252static void vfs_in_sync(cap_call_handle_t rid, ipc_call_t *request)
    253253{
    254254        int fd = IPC_GET_ARG1(*request);
    … …  
    257257}
    258258
    259 static void vfs_in_unlink(ipc_callid_t rid, ipc_call_t *request)
     259static void vfs_in_unlink(cap_call_handle_t rid, ipc_call_t *request)
    260260{
    261261        int parentfd = IPC_GET_ARG1(*request);
    … …  
    270270}
    271271
    272 static void vfs_in_unmount(ipc_callid_t rid, ipc_call_t *request)
     272static void vfs_in_unmount(cap_call_handle_t rid, ipc_call_t *request)
    273273{
    274274        int mpfd = IPC_GET_ARG1(*request);
    … …  
    277277}
    278278
    279 static void vfs_in_wait_handle(ipc_callid_t rid, ipc_call_t *request)
     279static void vfs_in_wait_handle(cap_call_handle_t rid, ipc_call_t *request)
    280280{
    281281        bool high_fd = IPC_GET_ARG1(*request);
    … …  
    285285}
    286286
    287 static void vfs_in_walk(ipc_callid_t rid, ipc_call_t *request)
     287static void vfs_in_walk(cap_call_handle_t rid, ipc_call_t *request)
    288288{
    289289        /*
    … …  
    304304}
    305305
    306 static void vfs_in_write(ipc_callid_t rid, ipc_call_t *request)
     306static void vfs_in_write(cap_call_handle_t rid, ipc_call_t *request)
    307307{
    308308        int fd = IPC_GET_ARG1(*request);
    … …  
    315315}
    316316
    317 void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     317void vfs_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    318318{
    319319        bool cont = true;
    … …  
    327327        while (cont) {
    328328                ipc_call_t call;
    329                 ipc_callid_t callid = async_get_call(&call);
     329                cap_call_handle_t callid = async_get_call(&call);
    330330
    331331                if (!IPC_GET_IMETHOD(call))
Note: See TracChangeset for help on using the changeset viewer.