Changeset 3be9d10 in mainline for uspace/drv


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/drv
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/block/ata_bd/main.c

    readaeae8 r3be9d10  
    4747static errno_t ata_fun_offline(ddf_fun_t *fun);
    4848
    49 static void ata_bd_connection(ipc_callid_t, ipc_call_t *, void *);
     49static void ata_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
    5050
    5151static driver_ops_t driver_ops = {
    … …  
    313313
    314314/** Block device connection handler */
    315 static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     315static void ata_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    316316{
    317317        ata_fun_t *afun;

  • uspace/drv/block/ddisk/ddisk.c

    readaeae8 r3be9d10  
    6262static errno_t ddisk_fun_offline(ddf_fun_t *);
    6363
    64 static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
     64static void ddisk_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
    6565
    6666static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
    … …  
    587587
    588588/** Block device connection handler */
    589 static void ddisk_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     589static void ddisk_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    590590{
    591591        ddisk_t *ddisk;

  • uspace/drv/block/usbmast/main.c

    readaeae8 r3be9d10  
    7979
    8080static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
    81 static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
     81static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
    8282    void *arg);
    8383
    … …  
    317317
    318318/** Blockdev client connection handler. */
    319 static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
     319static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
    320320    void *arg)
    321321{

  • uspace/drv/bus/adb/cuda_adb/cuda_adb.c

    readaeae8 r3be9d10  
    5555#define NAME  "cuda_adb"
    5656
    57 static void cuda_dev_connection(ipc_callid_t, ipc_call_t *, void *);
     57static void cuda_dev_connection(cap_call_handle_t, ipc_call_t *, void *);
    5858static errno_t cuda_init(cuda_t *);
    5959static void cuda_irq_handler(ipc_call_t *, void *);
    … …  
    198198
    199199/** Device connection handler */
    200 static void cuda_dev_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     200static void cuda_dev_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    201201{
    202202        adb_dev_t *dev = (adb_dev_t *) ddf_fun_data_get((ddf_fun_t *) arg);
    203         ipc_callid_t callid;
     203        cap_call_handle_t callid;
    204204        ipc_call_t call;
    205205        sysarg_t method;

  • uspace/drv/bus/usb/vhc/conndev.c

    readaeae8 r3be9d10  
    9393 * @param icall Call data.
    9494 */
    95 void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid,
     95void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
    9696    ipc_call_t *icall)
    9797{

  • uspace/drv/bus/usb/vhc/vhcd.h

    readaeae8 r3be9d10  
    8888
    8989void on_client_close(ddf_fun_t *fun);
    90 void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid,
     90void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
    9191    ipc_call_t *icall);
    9292

  • uspace/drv/char/i8042/i8042.c

    readaeae8 r3be9d10  
    6767#define i8042_KBD_TRANSLATE  0x40  /* Use this to switch to XT scancodes */
    6868
    69 static void i8042_char_conn(ipc_callid_t, ipc_call_t *, void *);
     69static void i8042_char_conn(cap_call_handle_t, ipc_call_t *, void *);
    7070static errno_t i8042_read(chardev_srv_t *, void *, size_t, size_t *);
    7171static errno_t i8042_write(chardev_srv_t *, const void *, size_t, size_t *);
    … …  
    418418 * @param arg  ddf_fun_t function.
    419419 */
    420 void i8042_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     420void i8042_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    421421{
    422422        i8042_port_t *port = ddf_fun_data_get((ddf_fun_t *)arg);

  • uspace/drv/char/msim-con/msim-con.c

    readaeae8 r3be9d10  
    4141#include "msim-con.h"
    4242
    43 static void msim_con_connection(ipc_callid_t, ipc_call_t *, void *);
     43static void msim_con_connection(cap_call_handle_t, ipc_call_t *, void *);
    4444
    4545static errno_t msim_con_read(chardev_srv_t *, void *, size_t, size_t *);
    … …  
    217217
    218218/** Character device connection handler. */
    219 static void msim_con_connection(ipc_callid_t iid, ipc_call_t *icall,
     219static void msim_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
    220220    void *arg)
    221221{

  • uspace/drv/char/ns8250/ns8250.c

    readaeae8 r3be9d10  
    311311static errno_t ns8250_open(chardev_srvs_t *, chardev_srv_t *);
    312312static errno_t ns8250_close(chardev_srv_t *);
    313 static void ns8250_default_handler(chardev_srv_t *, ipc_callid_t, ipc_call_t *);
     313static void ns8250_default_handler(chardev_srv_t *, cap_call_handle_t, ipc_call_t *);
    314314
    315315/** The character interface's callbacks. */
    … …  
    322322};
    323323
    324 static void ns8250_char_conn(ipc_callid_t, ipc_call_t *, void *);
     324static void ns8250_char_conn(cap_call_handle_t, ipc_call_t *, void *);
    325325
    326326static errno_t ns8250_dev_add(ddf_dev_t *dev);
    … …  
    10681068 * Configure the parameters of the serial communication.
    10691069 */
    1070 static void ns8250_default_handler(chardev_srv_t *srv, ipc_callid_t callid,
     1070static void ns8250_default_handler(chardev_srv_t *srv, cap_call_handle_t callid,
    10711071    ipc_call_t *call)
    10721072{
    … …  
    10991099}
    11001100
    1101 void ns8250_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     1101void ns8250_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    11021102{
    11031103        ns8250_t *ns8250 = fun_ns8250((ddf_fun_t *)arg);

  • uspace/drv/char/pl050/pl050.c

    readaeae8 r3be9d10  
    5454static errno_t pl050_fun_online(ddf_fun_t *);
    5555static errno_t pl050_fun_offline(ddf_fun_t *);
    56 static void pl050_char_conn(ipc_callid_t, ipc_call_t *, void *);
     56static void pl050_char_conn(cap_call_handle_t, ipc_call_t *, void *);
    5757static errno_t pl050_read(chardev_srv_t *, void *, size_t, size_t *);
    5858static errno_t pl050_write(chardev_srv_t *, const void *, size_t, size_t *);
    … …  
    286286}
    287287
    288 void pl050_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     288void pl050_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    289289{
    290290        pl050_t *pl050 = pl050_from_fun((ddf_fun_t *)arg);

  • uspace/drv/char/ski-con/ski-con.c

    readaeae8 r3be9d10  
    5050static errno_t ski_con_fibril(void *arg);
    5151static int32_t ski_con_getchar(void);
    52 static void ski_con_connection(ipc_callid_t, ipc_call_t *, void *);
     52static void ski_con_connection(cap_call_handle_t, ipc_call_t *, void *);
    5353
    5454static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *);
    … …  
    255255
    256256/** Character device connection handler. */
    257 static void ski_con_connection(ipc_callid_t iid, ipc_call_t *icall,
     257static void ski_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
    258258    void *arg)
    259259{

  • uspace/drv/char/sun4v-con/sun4v-con.c

    readaeae8 r3be9d10  
    4242#include "sun4v-con.h"
    4343
    44 static void sun4v_con_connection(ipc_callid_t, ipc_call_t *, void *);
     44static void sun4v_con_connection(cap_call_handle_t, ipc_call_t *, void *);
    4545
    4646#define POLL_INTERVAL  10000
    … …  
    180180
    181181/** Character device connection handler. */
    182 static void sun4v_con_connection(ipc_callid_t iid, ipc_call_t *icall,
     182static void sun4v_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
    183183    void *arg)
    184184{

  • uspace/drv/fb/amdm37x_dispc/main.c

    readaeae8 r3be9d10  
    4646#define NAME  "amdm37x_dispc"
    4747
    48 static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     48static void graph_vsl_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    4949{
    5050        visualizer_t *vsl;

  • uspace/drv/fb/kfb/port.c

    readaeae8 r3be9d10  
    162162};
    163163
    164 static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     164static void graph_vsl_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    165165{
    166166        visualizer_t *vsl;

  • uspace/drv/hid/adb-kbd/adb-kbd.c

    readaeae8 r3be9d10  
    4343#include "ctl.h"
    4444
    45 static void adb_kbd_events(ipc_callid_t, ipc_call_t *, void *);
     45static void adb_kbd_events(cap_call_handle_t, ipc_call_t *, void *);
    4646static void adb_kbd_reg0_data(adb_kbd_t *, uint16_t);
    47 static void adb_kbd_conn(ipc_callid_t, ipc_call_t *, void *);
     47static void adb_kbd_conn(cap_call_handle_t, ipc_call_t *, void *);
    4848
    4949/** Add ADB keyboard device */
    … …  
    130130}
    131131
    132 static void adb_kbd_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     132static void adb_kbd_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    133133{
    134134        adb_kbd_t *kbd = (adb_kbd_t *) arg;
    … …  
    138138
    139139                ipc_call_t call;
    140                 ipc_callid_t callid = async_get_call(&call);
     140                cap_call_handle_t callid = async_get_call(&call);
    141141
    142142                errno_t retval = EOK;
    … …  
    190190
    191191/** Handle client connection */
    192 static void adb_kbd_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    193 {
    194         ipc_callid_t callid;
     192static void adb_kbd_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
     193{
     194        cap_call_handle_t callid;
    195195        ipc_call_t call;
    196196        sysarg_t method;

  • uspace/drv/hid/adb-mouse/adb-mouse.c

    readaeae8 r3be9d10  
    4141#include "adb-mouse.h"
    4242
    43 static void adb_mouse_conn(ipc_callid_t, ipc_call_t *, void *);
     43static void adb_mouse_conn(cap_call_handle_t, ipc_call_t *, void *);
    4444
    4545static void adb_mouse_event_button(adb_mouse_t *mouse, int bnum, int bpress)
    … …  
    8888}
    8989
    90 static void adb_mouse_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     90static void adb_mouse_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    9191{
    9292        adb_mouse_t *mouse = (adb_mouse_t *) arg;
    … …  
    9595        while (true) {
    9696                ipc_call_t call;
    97                 ipc_callid_t callid = async_get_call(&call);
     97                cap_call_handle_t callid = async_get_call(&call);
    9898
    9999                errno_t retval = EOK;
    … …  
    200200
    201201/** Handle client connection */
    202 static void adb_mouse_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    203 {
    204         ipc_callid_t callid;
     202static void adb_mouse_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
     203{
     204        cap_call_handle_t callid;
    205205        ipc_call_t call;
    206206        sysarg_t method;

  • uspace/drv/hid/atkbd/atkbd.c

    readaeae8 r3be9d10  
    298298 */
    299299static void default_connection_handler(ddf_fun_t *fun,
    300     ipc_callid_t icallid, ipc_call_t *icall)
     300    cap_call_handle_t icallid, ipc_call_t *icall)
    301301{
    302302        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/hid/ps2mouse/ps2mouse.c

    readaeae8 r3be9d10  
    104104static errno_t polling_intellimouse(void *);
    105105static errno_t probe_intellimouse(ps2_mouse_t *, bool);
    106 static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
     106static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
    107107
    108108/** ps/2 mouse driver ops. */
    … …  
    404404 */
    405405void default_connection_handler(ddf_fun_t *fun,
    406     ipc_callid_t icallid, ipc_call_t *icall)
     406    cap_call_handle_t icallid, ipc_call_t *icall)
    407407{
    408408        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/hid/usbhid/kbd/kbddev.c

    readaeae8 r3be9d10  
    7272#include "../usbhid.h"
    7373
    74 static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
     74static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
    7575static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
    7676
    … …  
    161161 */
    162162static void default_connection_handler(ddf_fun_t *fun,
    163     ipc_callid_t icallid, ipc_call_t *icall)
     163    cap_call_handle_t icallid, ipc_call_t *icall)
    164164{
    165165        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/hid/usbhid/mouse/mousedev.c

    readaeae8 r3be9d10  
    5555#define NAME "mouse"
    5656
    57 static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
     57static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
    5858
    5959static ddf_dev_ops_t ops = { .default_handler = default_connection_handler };
    … …  
    114114 */
    115115static void default_connection_handler(ddf_fun_t *fun,
    116     ipc_callid_t icallid, ipc_call_t *icall)
     116    cap_call_handle_t icallid, ipc_call_t *icall)
    117117{
    118118        usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);

  • uspace/drv/hid/usbhid/multimedia/multimedia.c

    readaeae8 r3be9d10  
    8585 */
    8686static void default_connection_handler(ddf_fun_t *fun,
    87     ipc_callid_t icallid, ipc_call_t *icall)
     87    cap_call_handle_t icallid, ipc_call_t *icall)
    8888{
    8989        usb_log_debug(NAME " default_connection_handler()");

  • uspace/drv/hid/xtkbd/xtkbd.c

    readaeae8 r3be9d10  
    334334 */
    335335static void default_connection_handler(ddf_fun_t *fun,
    336     ipc_callid_t icallid, ipc_call_t *icall)
     336    cap_call_handle_t icallid, ipc_call_t *icall)
    337337{
    338338        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/intctl/apic/apic.c

    readaeae8 r3be9d10  
    164164 * @param arg   Local argument.
    165165 */
    166 static void apic_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    167 {
    168         ipc_callid_t callid;
     166static void apic_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
     167{
     168        cap_call_handle_t callid;
    169169        ipc_call_t call;
    170170        apic_t *apic;

  • uspace/drv/intctl/i8259/i8259.c

    readaeae8 r3be9d10  
    9393 * @param arg   Local argument.
    9494 */
    95 static void i8259_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    96 {
    97         ipc_callid_t callid;
     95static void i8259_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
     96{
     97        cap_call_handle_t callid;
    9898        ipc_call_t call;
    9999        i8259_t *i8259 = NULL /* XXX */;

  • uspace/drv/intctl/icp-ic/icp-ic.c

    readaeae8 r3be9d10  
    6969 * @param arg   Local argument.
    7070 */
    71 static void icpic_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     71static void icpic_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    7272{
    73         ipc_callid_t callid;
     73        cap_call_handle_t callid;
    7474        ipc_call_t call;
    7575        icpic_t *icpic;

  • uspace/drv/intctl/obio/obio.c

    readaeae8 r3be9d10  
    7373 * @param arg           Local argument.
    7474 */
    75 static void obio_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     75static void obio_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    7676{
    77         ipc_callid_t callid;
     77        cap_call_handle_t callid;
    7878        ipc_call_t call;
    7979        obio_t *obio;
Note: See TracChangeset for help on using the changeset viewer.