Changeset 3be9d10 in mainline for uspace/lib/c


Ignore:
Timestamp:
2018-03-21T21:29:31Z (7 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

Location:
uspace/lib/c
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/bd.c

    readaeae8 r3be9d10  
    4646#include <offset.h>
    4747
    48 static void bd_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
     48static void bd_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
    4949
    5050errno_t bd_open(async_sess_t *sess, bd_t **rbd)
     
    196196}
    197197
    198 static void bd_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     198static void bd_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    199199{
    200200        bd_t *bd = (bd_t *)arg;
     
    204204        while (true) {
    205205                ipc_call_t call;
    206                 ipc_callid_t callid = async_get_call(&call);
     206                cap_call_handle_t callid = async_get_call(&call);
    207207
    208208                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/bd_srv.c

    readaeae8 r3be9d10  
    4343#include <bd_srv.h>
    4444
    45 static void bd_read_blocks_srv(bd_srv_t *srv, ipc_callid_t callid,
     45static void bd_read_blocks_srv(bd_srv_t *srv, cap_call_handle_t callid,
    4646    ipc_call_t *call)
    4747{
     
    5151        size_t size;
    5252        errno_t rc;
    53         ipc_callid_t rcallid;
     53        cap_call_handle_t rcallid;
    5454
    5555        ba = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
     
    8989}
    9090
    91 static void bd_read_toc_srv(bd_srv_t *srv, ipc_callid_t callid,
     91static void bd_read_toc_srv(bd_srv_t *srv, cap_call_handle_t callid,
    9292    ipc_call_t *call)
    9393{
     
    9696        size_t size;
    9797        errno_t rc;
    98         ipc_callid_t rcallid;
     98        cap_call_handle_t rcallid;
    9999
    100100        session = IPC_GET_ARG1(*call);
     
    133133}
    134134
    135 static void bd_sync_cache_srv(bd_srv_t *srv, ipc_callid_t callid,
     135static void bd_sync_cache_srv(bd_srv_t *srv, cap_call_handle_t callid,
    136136    ipc_call_t *call)
    137137{
     
    152152}
    153153
    154 static void bd_write_blocks_srv(bd_srv_t *srv, ipc_callid_t callid,
     154static void bd_write_blocks_srv(bd_srv_t *srv, cap_call_handle_t callid,
    155155    ipc_call_t *call)
    156156{
     
    180180}
    181181
    182 static void bd_get_block_size_srv(bd_srv_t *srv, ipc_callid_t callid,
     182static void bd_get_block_size_srv(bd_srv_t *srv, cap_call_handle_t callid,
    183183    ipc_call_t *call)
    184184{
     
    195195}
    196196
    197 static void bd_get_num_blocks_srv(bd_srv_t *srv, ipc_callid_t callid,
     197static void bd_get_num_blocks_srv(bd_srv_t *srv, cap_call_handle_t callid,
    198198    ipc_call_t *call)
    199199{
     
    228228}
    229229
    230 errno_t bd_conn(ipc_callid_t iid, ipc_call_t *icall, bd_srvs_t *srvs)
     230errno_t bd_conn(cap_call_handle_t iid, ipc_call_t *icall, bd_srvs_t *srvs)
    231231{
    232232        bd_srv_t *srv;
     
    252252        while (true) {
    253253                ipc_call_t call;
    254                 ipc_callid_t callid = async_get_call(&call);
     254                cap_call_handle_t callid = async_get_call(&call);
    255255                sysarg_t method = IPC_GET_IMETHOD(call);
    256256
  • uspace/lib/c/generic/inet.c

    readaeae8 r3be9d10  
    3636#include <stdlib.h>
    3737
    38 static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
     38static void inet_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
    3939
    4040static async_sess_t *inet_sess = NULL;
     
    176176}
    177177
    178 static void inet_ev_recv(ipc_callid_t iid, ipc_call_t *icall)
     178static void inet_ev_recv(cap_call_handle_t iid, ipc_call_t *icall)
    179179{
    180180        inet_dgram_t dgram;
     
    183183        dgram.iplink = IPC_GET_ARG2(*icall);
    184184
    185         ipc_callid_t callid;
     185        cap_call_handle_t callid;
    186186        size_t size;
    187187        if (!async_data_write_receive(&callid, &size)) {
     
    234234}
    235235
    236 static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     236static void inet_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    237237{
    238238        while (true) {
    239239                ipc_call_t call;
    240                 ipc_callid_t callid = async_get_call(&call);
     240                cap_call_handle_t callid = async_get_call(&call);
    241241
    242242                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/inet/tcp.c

    readaeae8 r3be9d10  
    4141#include <stdlib.h>
    4242
    43 static void tcp_cb_conn(ipc_callid_t, ipc_call_t *, void *);
     43static void tcp_cb_conn(cap_call_handle_t, ipc_call_t *, void *);
    4444static errno_t tcp_conn_fibril(void *);
    4545
     
    637637 * @param icall Call data
    638638 */
    639 static void tcp_ev_connected(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
     639static void tcp_ev_connected(tcp_t *tcp, cap_call_handle_t iid, ipc_call_t *icall)
    640640{
    641641        tcp_conn_t *conn;
     
    665665 * @param icall Call data
    666666 */
    667 static void tcp_ev_conn_failed(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
     667static void tcp_ev_conn_failed(tcp_t *tcp, cap_call_handle_t iid, ipc_call_t *icall)
    668668{
    669669        tcp_conn_t *conn;
     
    693693 * @param icall Call data
    694694 */
    695 static void tcp_ev_conn_reset(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
     695static void tcp_ev_conn_reset(tcp_t *tcp, cap_call_handle_t iid, ipc_call_t *icall)
    696696{
    697697        tcp_conn_t *conn;
     
    721721 * @param icall Call data
    722722 */
    723 static void tcp_ev_data(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
     723static void tcp_ev_data(tcp_t *tcp, cap_call_handle_t iid, ipc_call_t *icall)
    724724{
    725725        tcp_conn_t *conn;
     
    750750 * @param icall Call data
    751751 */
    752 static void tcp_ev_urg_data(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
     752static void tcp_ev_urg_data(tcp_t *tcp, cap_call_handle_t iid, ipc_call_t *icall)
    753753{
    754754        async_answer_0(iid, ENOTSUP);
     
    761761 * @param icall Call data
    762762 */
    763 static void tcp_ev_new_conn(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
     763static void tcp_ev_new_conn(tcp_t *tcp, cap_call_handle_t iid, ipc_call_t *icall)
    764764{
    765765        tcp_listener_t *lst;
     
    813813 * @param arg Argument, TCP client
    814814 */
    815 static void tcp_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     815static void tcp_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    816816{
    817817        tcp_t *tcp = (tcp_t *)arg;
     
    821821        while (true) {
    822822                ipc_call_t call;
    823                 ipc_callid_t callid = async_get_call(&call);
     823                cap_call_handle_t callid = async_get_call(&call);
    824824
    825825                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/inet/udp.c

    readaeae8 r3be9d10  
    4141#include <stdlib.h>
    4242
    43 static void udp_cb_conn(ipc_callid_t, ipc_call_t *, void *);
     43static void udp_cb_conn(cap_call_handle_t, ipc_call_t *, void *);
    4444
    4545/** Create callback connection from UDP service.
     
    455455 * @param icall IPC message
    456456 */
    457 static void udp_ev_data(udp_t *udp, ipc_callid_t iid, ipc_call_t *icall)
     457static void udp_ev_data(udp_t *udp, cap_call_handle_t iid, ipc_call_t *icall)
    458458{
    459459        udp_rmsg_t rmsg;
     
    490490 * @param arg Argument, UDP client
    491491 */
    492 static void udp_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     492static void udp_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    493493{
    494494        udp_t *udp = (udp_t *)arg;
     
    498498        while (true) {
    499499                ipc_call_t call;
    500                 ipc_callid_t callid = async_get_call(&call);
     500                cap_call_handle_t callid = async_get_call(&call);
    501501
    502502                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/inetping.c

    readaeae8 r3be9d10  
    3838#include <str.h>
    3939
    40 static void inetping_cb_conn(ipc_callid_t, ipc_call_t *, void *);
    41 static void inetping_ev_recv(ipc_callid_t, ipc_call_t *);
     40static void inetping_cb_conn(cap_call_handle_t, ipc_call_t *, void *);
     41static void inetping_ev_recv(cap_call_handle_t, ipc_call_t *);
    4242
    4343static async_sess_t *inetping_sess = NULL;
     
    150150}
    151151
    152 static void inetping_ev_recv(ipc_callid_t iid, ipc_call_t *icall)
     152static void inetping_ev_recv(cap_call_handle_t iid, ipc_call_t *icall)
    153153{
    154154        inetping_sdu_t sdu;
     
    156156        sdu.seq_no = IPC_GET_ARG1(*icall);
    157157
    158         ipc_callid_t callid;
     158        cap_call_handle_t callid;
    159159        size_t size;
    160160        if (!async_data_write_receive(&callid, &size)) {
     
    207207}
    208208
    209 static void inetping_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     209static void inetping_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    210210{
    211211        while (true) {
    212212                ipc_call_t call;
    213                 ipc_callid_t callid = async_get_call(&call);
     213                cap_call_handle_t callid = async_get_call(&call);
    214214
    215215                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/io/chardev_srv.c

    readaeae8 r3be9d10  
    4343static chardev_srv_t *chardev_srv_create(chardev_srvs_t *);
    4444
    45 static void chardev_read_srv(chardev_srv_t *srv, ipc_callid_t callid,
     45static void chardev_read_srv(chardev_srv_t *srv, cap_call_handle_t callid,
    4646    ipc_call_t *call)
    4747{
     
    5050        size_t nread;
    5151        errno_t rc;
    52         ipc_callid_t rcallid;
     52        cap_call_handle_t rcallid;
    5353
    5454        if (!async_data_read_receive(&rcallid, &size)) {
     
    8585}
    8686
    87 static void chardev_write_srv(chardev_srv_t *srv, ipc_callid_t callid,
     87static void chardev_write_srv(chardev_srv_t *srv, cap_call_handle_t callid,
    8888    ipc_call_t *call)
    8989{
     
    132132}
    133133
    134 errno_t chardev_conn(ipc_callid_t iid, ipc_call_t *icall, chardev_srvs_t *srvs)
     134errno_t chardev_conn(cap_call_handle_t iid, ipc_call_t *icall, chardev_srvs_t *srvs)
    135135{
    136136        chardev_srv_t *srv;
     
    152152        while (true) {
    153153                ipc_call_t call;
    154                 ipc_callid_t callid = async_get_call(&call);
     154                cap_call_handle_t callid = async_get_call(&call);
    155155                sysarg_t method = IPC_GET_IMETHOD(call);
    156156
  • uspace/lib/c/generic/io/con_srv.c

    readaeae8 r3be9d10  
    6666}
    6767
    68 static void con_read_srv(con_srv_t *srv, ipc_callid_t callid,
     68static void con_read_srv(con_srv_t *srv, cap_call_handle_t callid,
    6969    ipc_call_t *call)
    7070{
     
    7272        size_t size;
    7373        errno_t rc;
    74         ipc_callid_t rcallid;
     74        cap_call_handle_t rcallid;
    7575
    7676        if (!async_data_read_receive(&rcallid, &size)) {
     
    108108}
    109109
    110 static void con_write_srv(con_srv_t *srv, ipc_callid_t callid,
     110static void con_write_srv(con_srv_t *srv, cap_call_handle_t callid,
    111111    ipc_call_t *call)
    112112{
     
    133133}
    134134
    135 static void con_sync_srv(con_srv_t *srv, ipc_callid_t callid,
     135static void con_sync_srv(con_srv_t *srv, cap_call_handle_t callid,
    136136    ipc_call_t *call)
    137137{
     
    145145}
    146146
    147 static void con_clear_srv(con_srv_t *srv, ipc_callid_t callid,
     147static void con_clear_srv(con_srv_t *srv, cap_call_handle_t callid,
    148148    ipc_call_t *call)
    149149{
     
    157157}
    158158
    159 static void con_set_pos_srv(con_srv_t *srv, ipc_callid_t callid,
     159static void con_set_pos_srv(con_srv_t *srv, cap_call_handle_t callid,
    160160    ipc_call_t *call)
    161161{
     
    175175}
    176176
    177 static void con_get_pos_srv(con_srv_t *srv, ipc_callid_t callid,
     177static void con_get_pos_srv(con_srv_t *srv, cap_call_handle_t callid,
    178178    ipc_call_t *call)
    179179{
     
    191191}
    192192
    193 static void con_get_size_srv(con_srv_t *srv, ipc_callid_t callid,
     193static void con_get_size_srv(con_srv_t *srv, cap_call_handle_t callid,
    194194    ipc_call_t *call)
    195195{
     
    207207}
    208208
    209 static void con_get_color_cap_srv(con_srv_t *srv, ipc_callid_t callid,
     209static void con_get_color_cap_srv(con_srv_t *srv, cap_call_handle_t callid,
    210210    ipc_call_t *call)
    211211{
     
    222222}
    223223
    224 static void con_set_style_srv(con_srv_t *srv, ipc_callid_t callid,
     224static void con_set_style_srv(con_srv_t *srv, cap_call_handle_t callid,
    225225    ipc_call_t *call)
    226226{
     
    238238}
    239239
    240 static void con_set_color_srv(con_srv_t *srv, ipc_callid_t callid,
     240static void con_set_color_srv(con_srv_t *srv, cap_call_handle_t callid,
    241241    ipc_call_t *call)
    242242{
     
    258258}
    259259
    260 static void con_set_rgb_color_srv(con_srv_t *srv, ipc_callid_t callid,
     260static void con_set_rgb_color_srv(con_srv_t *srv, cap_call_handle_t callid,
    261261    ipc_call_t *call)
    262262{
     
    276276}
    277277
    278 static void con_set_cursor_visibility_srv(con_srv_t *srv, ipc_callid_t callid,
     278static void con_set_cursor_visibility_srv(con_srv_t *srv, cap_call_handle_t callid,
    279279    ipc_call_t *call)
    280280{
     
    292292}
    293293
    294 static void con_get_event_srv(con_srv_t *srv, ipc_callid_t callid,
     294static void con_get_event_srv(con_srv_t *srv, cap_call_handle_t callid,
    295295    ipc_call_t *call)
    296296{
     
    340340}
    341341
    342 errno_t con_conn(ipc_callid_t iid, ipc_call_t *icall, con_srvs_t *srvs)
     342errno_t con_conn(cap_call_handle_t iid, ipc_call_t *icall, con_srvs_t *srvs)
    343343{
    344344        con_srv_t *srv;
     
    366366        while (true) {
    367367                ipc_call_t call;
    368                 ipc_callid_t callid = 0;
     368                cap_call_handle_t callid = 0;
    369369
    370370                while (callid == 0) {
  • uspace/lib/c/generic/io/input.c

    readaeae8 r3be9d10  
    4343#include <stdlib.h>
    4444
    45 static void input_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
     45static void input_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
    4646
    4747errno_t input_open(async_sess_t *sess, input_ev_ops_t *ev_ops,
     
    9292}
    9393
    94 static void input_ev_active(input_t *input, ipc_callid_t callid,
     94static void input_ev_active(input_t *input, cap_call_handle_t callid,
    9595    ipc_call_t *call)
    9696{
     
    9999}
    100100
    101 static void input_ev_deactive(input_t *input, ipc_callid_t callid,
     101static void input_ev_deactive(input_t *input, cap_call_handle_t callid,
    102102    ipc_call_t *call)
    103103{
     
    106106}
    107107
    108 static void input_ev_key(input_t *input, ipc_callid_t callid,
     108static void input_ev_key(input_t *input, cap_call_handle_t callid,
    109109    ipc_call_t *call)
    110110{
     
    124124}
    125125
    126 static void input_ev_move(input_t *input, ipc_callid_t callid,
     126static void input_ev_move(input_t *input, cap_call_handle_t callid,
    127127    ipc_call_t *call)
    128128{
     
    138138}
    139139
    140 static void input_ev_abs_move(input_t *input, ipc_callid_t callid,
     140static void input_ev_abs_move(input_t *input, cap_call_handle_t callid,
    141141    ipc_call_t *call)
    142142{
     
    156156}
    157157
    158 static void input_ev_button(input_t *input, ipc_callid_t callid,
     158static void input_ev_button(input_t *input, cap_call_handle_t callid,
    159159    ipc_call_t *call)
    160160{
     
    170170}
    171171
    172 static void input_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     172static void input_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    173173{
    174174        input_t *input = (input_t *)arg;
     
    176176        while (true) {
    177177                ipc_call_t call;
    178                 ipc_callid_t callid = async_get_call(&call);
     178                cap_call_handle_t callid = async_get_call(&call);
    179179
    180180                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/iplink.c

    readaeae8 r3be9d10  
    4545#include <stdlib.h>
    4646
    47 static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
     47static void iplink_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
    4848
    4949errno_t iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops, void *arg,
     
    245245}
    246246
    247 static void iplink_ev_recv(iplink_t *iplink, ipc_callid_t iid,
     247static void iplink_ev_recv(iplink_t *iplink, cap_call_handle_t iid,
    248248    ipc_call_t *icall)
    249249{
     
    264264}
    265265
    266 static void iplink_ev_change_addr(iplink_t *iplink, ipc_callid_t iid,
     266static void iplink_ev_change_addr(iplink_t *iplink, cap_call_handle_t iid,
    267267    ipc_call_t *icall)
    268268{
     
    282282}
    283283
    284 static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     284static void iplink_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    285285{
    286286        iplink_t *iplink = (iplink_t *) arg;
     
    288288        while (true) {
    289289                ipc_call_t call;
    290                 ipc_callid_t callid = async_get_call(&call);
     290                cap_call_handle_t callid = async_get_call(&call);
    291291
    292292                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/iplink_srv.c

    readaeae8 r3be9d10  
    4242#include <inet/iplink_srv.h>
    4343
    44 static void iplink_get_mtu_srv(iplink_srv_t *srv, ipc_callid_t callid,
     44static void iplink_get_mtu_srv(iplink_srv_t *srv, cap_call_handle_t callid,
    4545    ipc_call_t *call)
    4646{
     
    5050}
    5151
    52 static void iplink_get_mac48_srv(iplink_srv_t *srv, ipc_callid_t iid,
     52static void iplink_get_mac48_srv(iplink_srv_t *srv, cap_call_handle_t iid,
    5353    ipc_call_t *icall)
    5454{
     
    6060        }
    6161
    62         ipc_callid_t callid;
     62        cap_call_handle_t callid;
    6363        size_t size;
    6464        if (!async_data_read_receive(&callid, &size)) {
     
    8181}
    8282
    83 static void iplink_set_mac48_srv(iplink_srv_t *srv, ipc_callid_t iid,
     83static void iplink_set_mac48_srv(iplink_srv_t *srv, cap_call_handle_t iid,
    8484    ipc_call_t *icall)
    8585{
     
    8787        size_t size;
    8888        addr48_t mac;
    89         ipc_callid_t callid;
     89        cap_call_handle_t callid;
    9090
    9191        if (!async_data_write_receive(&callid, &size)) {
     
    107107}
    108108
    109 static void iplink_addr_add_srv(iplink_srv_t *srv, ipc_callid_t iid,
    110     ipc_call_t *icall)
    111 {
    112         ipc_callid_t callid;
     109static void iplink_addr_add_srv(iplink_srv_t *srv, cap_call_handle_t iid,
     110    ipc_call_t *icall)
     111{
     112        cap_call_handle_t callid;
    113113        size_t size;
    114114        if (!async_data_write_receive(&callid, &size)) {
     
    135135}
    136136
    137 static void iplink_addr_remove_srv(iplink_srv_t *srv, ipc_callid_t iid,
    138     ipc_call_t *icall)
    139 {
    140         ipc_callid_t callid;
     137static void iplink_addr_remove_srv(iplink_srv_t *srv, cap_call_handle_t iid,
     138    ipc_call_t *icall)
     139{
     140        cap_call_handle_t callid;
    141141        size_t size;
    142142        if (!async_data_write_receive(&callid, &size)) {
     
    163163}
    164164
    165 static void iplink_send_srv(iplink_srv_t *srv, ipc_callid_t iid,
     165static void iplink_send_srv(iplink_srv_t *srv, cap_call_handle_t iid,
    166166    ipc_call_t *icall)
    167167{
     
    183183}
    184184
    185 static void iplink_send6_srv(iplink_srv_t *srv, ipc_callid_t iid,
     185static void iplink_send6_srv(iplink_srv_t *srv, cap_call_handle_t iid,
    186186    ipc_call_t *icall)
    187187{
    188188        iplink_sdu6_t sdu;
    189189
    190         ipc_callid_t callid;
     190        cap_call_handle_t callid;
    191191        size_t size;
    192192        if (!async_data_write_receive(&callid, &size)) {
     
    229229}
    230230
    231 errno_t iplink_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     231errno_t iplink_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    232232{
    233233        iplink_srv_t *srv = (iplink_srv_t *) arg;
     
    259259        while (true) {
    260260                ipc_call_t call;
    261                 ipc_callid_t callid = async_get_call(&call);
     261                cap_call_handle_t callid = async_get_call(&call);
    262262                sysarg_t method = IPC_GET_IMETHOD(call);
    263263
  • uspace/lib/c/generic/loc.c

    readaeae8 r3be9d10  
    5555static async_sess_t *loc_consumer_sess = NULL;
    5656
    57 static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     57static void loc_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    5858{
    5959        while (true) {
    6060                ipc_call_t call;
    61                 ipc_callid_t callid = async_get_call(&call);
     61                cap_call_handle_t callid = async_get_call(&call);
    6262
    6363                if (!IPC_GET_IMETHOD(call)) {
  • uspace/lib/c/generic/vfs/vfs.c

    readaeae8 r3be9d10  
    802802errno_t vfs_receive_handle(bool high, int *handle)
    803803{
    804         ipc_callid_t callid;
     804        cap_call_handle_t callid;
    805805        if (!async_state_change_receive(&callid, NULL, NULL, NULL)) {
    806806                async_answer_0(callid, EINVAL);
  • uspace/lib/c/include/bd_srv.h

    readaeae8 r3be9d10  
    7070extern void bd_srvs_init(bd_srvs_t *);
    7171
    72 extern errno_t bd_conn(ipc_callid_t, ipc_call_t *, bd_srvs_t *);
     72extern errno_t bd_conn(cap_call_handle_t, ipc_call_t *, bd_srvs_t *);
    7373
    7474#endif
  • uspace/lib/c/include/inet/iplink_srv.h

    readaeae8 r3be9d10  
    6666extern void iplink_srv_init(iplink_srv_t *);
    6767
    68 extern errno_t iplink_conn(ipc_callid_t, ipc_call_t *, void *);
     68extern errno_t iplink_conn(cap_call_handle_t, ipc_call_t *, void *);
    6969extern errno_t iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t);
    7070extern errno_t iplink_ev_change_addr(iplink_srv_t *, addr48_t *);
  • uspace/lib/c/include/io/chardev_srv.h

    readaeae8 r3be9d10  
    6161        errno_t (*read)(chardev_srv_t *, void *, size_t, size_t *);
    6262        errno_t (*write)(chardev_srv_t *, const void *, size_t, size_t *);
    63         void (*def_handler)(chardev_srv_t *, ipc_callid_t, ipc_call_t *);
     63        void (*def_handler)(chardev_srv_t *, cap_call_handle_t, ipc_call_t *);
    6464};
    6565
    6666extern void chardev_srvs_init(chardev_srvs_t *);
    6767
    68 extern errno_t chardev_conn(ipc_callid_t, ipc_call_t *, chardev_srvs_t *);
     68extern errno_t chardev_conn(cap_call_handle_t, ipc_call_t *, chardev_srvs_t *);
    6969
    7070#endif
  • uspace/lib/c/include/io/con_srv.h

    readaeae8 r3be9d10  
    8787extern void con_srvs_init(con_srvs_t *);
    8888
    89 extern errno_t con_conn(ipc_callid_t, ipc_call_t *, con_srvs_t *);
     89extern errno_t con_conn(cap_call_handle_t, ipc_call_t *, con_srvs_t *);
    9090
    9191#endif
  • uspace/lib/c/include/ipc/common.h

    readaeae8 r3be9d10  
    5555} ipc_call_t;
    5656
    57 typedef cap_call_handle_t ipc_callid_t;
    58 
    5957extern futex_t async_futex;
    6058
Note: See TracChangeset for help on using the changeset viewer.