Changeset 3be9d10 in mainline for uspace/srv/hid


Ignore:
Timestamp:
2018-03-21T21:29:31Z (8 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/srv/hid
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/compositor/compositor.c

    readaeae8 r3be9d10  
    589589}
    590590
    591 static void comp_window_get_event(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
     591static void comp_window_get_event(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
    592592{
    593593        window_event_t *event = (window_event_t *) prodcons_consume(&win->queue);
    594594
    595         ipc_callid_t callid;
     595        cap_call_handle_t callid;
    596596        size_t len;
    597597
    … …  
    613613}
    614614
    615 static void comp_window_damage(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
     615static void comp_window_damage(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
    616616{
    617617        double x = IPC_GET_ARG1(*icall);
    … …  
    634634}
    635635
    636 static void comp_window_grab(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
     636static void comp_window_grab(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
    637637{
    638638        sysarg_t pos_id = IPC_GET_ARG1(*icall);
    … …  
    693693}
    694694
    695 static void comp_window_resize(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
    696 {
    697         ipc_callid_t callid;
     695static void comp_window_resize(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
     696{
     697        cap_call_handle_t callid;
    698698        size_t size;
    699699        unsigned int flags;
    … …  
    836836}
    837837
    838 static void comp_window_close(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
     838static void comp_window_close(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
    839839{
    840840        /* Stop managing the window. */
    … …  
    879879}
    880880
    881 static void comp_window_close_request(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
     881static void comp_window_close_request(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
    882882{
    883883        window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
    … …  
    894894}
    895895
    896 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     896static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    897897{
    898898        ipc_call_t call;
    899         ipc_callid_t callid;
     899        cap_call_handle_t callid;
    900900        service_id_t service_id = (service_id_t) IPC_GET_ARG2(*icall);
    901901
    … …  
    10421042}
    10431043
    1044 static void comp_mode_change(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
     1044static void comp_mode_change(viewport_t *vp, cap_call_handle_t iid, ipc_call_t *icall)
    10451045{
    10461046        sysarg_t mode_idx = IPC_GET_ARG2(*icall);
    … …  
    11211121#endif
    11221122
    1123 static void comp_visualizer_disconnect(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
     1123static void comp_visualizer_disconnect(viewport_t *vp, cap_call_handle_t iid, ipc_call_t *icall)
    11241124{
    11251125        /* Release viewport resources. */
    … …  
    11371137}
    11381138
    1139 static void vsl_notifications(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     1139static void vsl_notifications(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    11401140{
    11411141        viewport_t *vp = NULL;
    … …  
    11551155        while (true) {
    11561156                ipc_call_t call;
    1157                 ipc_callid_t callid = async_get_call(&call);
     1157                cap_call_handle_t callid = async_get_call(&call);
    11581158
    11591159                if (!IPC_GET_IMETHOD(call)) {

  • uspace/srv/hid/console/console.c

    readaeae8 r3be9d10  
    507507}
    508508
    509 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     509static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    510510{
    511511        console_t *cons = NULL;

  • uspace/srv/hid/input/ctl/kbdev.c

    readaeae8 r3be9d10  
    5454static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned int);
    5555
    56 static void kbdev_callback_conn(ipc_callid_t, ipc_call_t *, void *arg);
     56static void kbdev_callback_conn(cap_call_handle_t, ipc_call_t *, void *arg);
    5757
    5858kbd_ctl_ops_t kbdev_ctl = {
    … …  
    147147}
    148148
    149 static void kbdev_callback_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     149static void kbdev_callback_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    150150{
    151151        kbdev_t *kbdev;
    … …  
    158158        while (true) {
    159159                ipc_call_t call;
    160                 ipc_callid_t callid;
     160                cap_call_handle_t callid;
    161161
    162162                callid = async_get_call(&call);

  • uspace/srv/hid/input/input.c

    readaeae8 r3be9d10  
    320320
    321321/** New client connection */
    322 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     322static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    323323{
    324324        client_t *client = (client_t *) async_get_client_data();
    … …  
    332332        while (true) {
    333333                ipc_call_t call;
    334                 ipc_callid_t callid = async_get_call(&call);
     334                cap_call_handle_t callid = async_get_call(&call);
    335335
    336336                if (!IPC_GET_IMETHOD(call)) {

  • uspace/srv/hid/input/proto/mousedev.c

    readaeae8 r3be9d10  
    7070}
    7171
    72 static void mousedev_callback_conn(ipc_callid_t iid, ipc_call_t *icall,
     72static void mousedev_callback_conn(cap_call_handle_t iid, ipc_call_t *icall,
    7373    void *arg)
    7474{
    … …  
    7878        while (true) {
    7979                ipc_call_t call;
    80                 ipc_callid_t callid = async_get_call(&call);
     80                cap_call_handle_t callid = async_get_call(&call);
    8181
    8282                if (!IPC_GET_IMETHOD(call)) {

  • uspace/srv/hid/isdv4_tablet/main.c

    readaeae8 r3be9d10  
    6363}
    6464
    65 static void mouse_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     65static void mouse_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    6666{
    6767        async_answer_0(iid, EOK);
    … …  
    7979        while (true) {
    8080                ipc_call_t call;
    81                 ipc_callid_t callid = async_get_call(&call);
     81                cap_call_handle_t callid = async_get_call(&call);
    8282
    8383                if (!IPC_GET_IMETHOD(call))

  • uspace/srv/hid/output/output.c

    readaeae8 r3be9d10  
    7878}
    7979
    80 static void srv_yield(ipc_callid_t iid, ipc_call_t *icall)
     80static void srv_yield(cap_call_handle_t iid, ipc_call_t *icall)
    8181{
    8282        errno_t ret = EOK;
    … …  
    9393}
    9494
    95 static void srv_claim(ipc_callid_t iid, ipc_call_t *icall)
     95static void srv_claim(cap_call_handle_t iid, ipc_call_t *icall)
    9696{
    9797        errno_t ret = EOK;
    … …  
    108108}
    109109
    110 static void srv_get_dimensions(ipc_callid_t iid, ipc_call_t *icall)
     110static void srv_get_dimensions(cap_call_handle_t iid, ipc_call_t *icall)
    111111{
    112112        sysarg_t cols = MAX_COLS;
    … …  
    121121}
    122122
    123 static void srv_get_caps(ipc_callid_t iid, ipc_call_t *icall)
     123static void srv_get_caps(cap_call_handle_t iid, ipc_call_t *icall)
    124124{
    125125        console_caps_t caps = 0;
    … …  
    134134}
    135135
    136 static frontbuf_t *resolve_frontbuf(sysarg_t handle, ipc_callid_t iid)
     136static frontbuf_t *resolve_frontbuf(sysarg_t handle, cap_call_handle_t iid)
    137137{
    138138        frontbuf_t *frontbuf = NULL;
    … …  
    152152}
    153153
    154 static void srv_frontbuf_create(ipc_callid_t iid, ipc_call_t *icall)
     154static void srv_frontbuf_create(cap_call_handle_t iid, ipc_call_t *icall)
    155155{
    156156        frontbuf_t *frontbuf = (frontbuf_t *) malloc(sizeof(frontbuf_t));
    … …  
    162162        link_initialize(&frontbuf->link);
    163163
    164         ipc_callid_t callid;
     164        cap_call_handle_t callid;
    165165        if (!async_share_out_receive(&callid, &frontbuf->size,
    166166            &frontbuf->flags)) {
    … …  
    181181}
    182182
    183 static void srv_frontbuf_destroy(ipc_callid_t iid, ipc_call_t *icall)
     183static void srv_frontbuf_destroy(cap_call_handle_t iid, ipc_call_t *icall)
    184184{
    185185        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
    … …  
    194194}
    195195
    196 static void srv_cursor_update(ipc_callid_t iid, ipc_call_t *icall)
     196static void srv_cursor_update(cap_call_handle_t iid, ipc_call_t *icall)
    197197{
    198198        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
    … …  
    226226}
    227227
    228 static void srv_set_style(ipc_callid_t iid, ipc_call_t *icall)
     228static void srv_set_style(cap_call_handle_t iid, ipc_call_t *icall)
    229229{
    230230        list_foreach(outdevs, link, outdev_t, dev) {
    … …  
    237237}
    238238
    239 static void srv_set_color(ipc_callid_t iid, ipc_call_t *icall)
     239static void srv_set_color(cap_call_handle_t iid, ipc_call_t *icall)
    240240{
    241241        list_foreach(outdevs, link, outdev_t, dev) {
    … …  
    252252}
    253253
    254 static void srv_set_rgb_color(ipc_callid_t iid, ipc_call_t *icall)
     254static void srv_set_rgb_color(cap_call_handle_t iid, ipc_call_t *icall)
    255255{
    256256        list_foreach(outdevs, link, outdev_t, dev) {
    … …  
    302302}
    303303
    304 static void srv_update(ipc_callid_t iid, ipc_call_t *icall)
     304static void srv_update(cap_call_handle_t iid, ipc_call_t *icall)
    305305{
    306306        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
    … …  
    352352}
    353353
    354 static void srv_damage(ipc_callid_t iid, ipc_call_t *icall)
     354static void srv_damage(cap_call_handle_t iid, ipc_call_t *icall)
    355355{
    356356        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
    … …  
    391391}
    392392
    393 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     393static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    394394{
    395395        /* Accept the connection */
    … …  
    398398        while (true) {
    399399                ipc_call_t call;
    400                 ipc_callid_t callid = async_get_call(&call);
     400                cap_call_handle_t callid = async_get_call(&call);
    401401
    402402                if (!IPC_GET_IMETHOD(call)) {

  • uspace/srv/hid/remcons/remcons.c

    readaeae8 r3be9d10  
    216216
    217217/** Callback when client connects to a telnet terminal. */
    218 static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     218static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    219219{
    220220        /* Find the user. */

  • uspace/srv/hid/rfb/main.c

    readaeae8 r3be9d10  
    146146}
    147147
    148 static void client_connection(ipc_callid_t callid, ipc_call_t *call, void *data)
     148static void client_connection(cap_call_handle_t callid, ipc_call_t *call, void *data)
    149149{
    150150        graph_visualizer_connection(vis, callid, call, data);

  • uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

    readaeae8 r3be9d10  
    6969static s3c24xx_ts_t *ts;
    7070
    71 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
     71static void s3c24xx_ts_connection(cap_call_handle_t iid, ipc_call_t *icall,
    7272    void *arg);
    7373static void s3c24xx_ts_irq_handler(ipc_call_t *call, void *);
    … …  
    373373
    374374/** Handle mouse client connection. */
    375 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
     375static void s3c24xx_ts_connection(cap_call_handle_t iid, ipc_call_t *icall,
    376376    void *arg)
    377377{
    … …  
    380380        while (true) {
    381381                ipc_call_t call;
    382                 ipc_callid_t callid = async_get_call(&call);
     382                cap_call_handle_t callid = async_get_call(&call);
    383383
    384384                if (!IPC_GET_IMETHOD(call)) {
Note: See TracChangeset for help on using the changeset viewer.