Changeset 3be9d10 in mainline for uspace/srv/devman


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/srv/devman
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/devman/client_conn.c

    readaeae8 r3be9d10  
    6161/** Find handle for the device instance identified by the device's path in the
    6262 * device tree. */
    63 static void devman_function_get_handle(ipc_callid_t iid, ipc_call_t *icall)
     63static void devman_function_get_handle(cap_call_handle_t iid, ipc_call_t *icall)
    6464{
    6565        char *pathname;
    … …  
    100100
    101101/** Get device match ID. */
    102 static void devman_fun_get_match_id(ipc_callid_t iid, ipc_call_t *icall)
     102static void devman_fun_get_match_id(cap_call_handle_t iid, ipc_call_t *icall)
    103103{
    104104        devman_handle_t handle = IPC_GET_ARG1(*icall);
    … …  
    112112        }
    113113
    114         ipc_callid_t data_callid;
     114        cap_call_handle_t data_callid;
    115115        size_t data_len;
    116116        if (!async_data_read_receive(&data_callid, &data_len)) {
    … …  
    163163
    164164/** Get device name. */
    165 static void devman_fun_get_name(ipc_callid_t iid, ipc_call_t *icall)
     165static void devman_fun_get_name(cap_call_handle_t iid, ipc_call_t *icall)
    166166{
    167167        devman_handle_t handle = IPC_GET_ARG1(*icall);
    … …  
    173173        }
    174174
    175         ipc_callid_t data_callid;
     175        cap_call_handle_t data_callid;
    176176        size_t data_len;
    177177        if (!async_data_read_receive(&data_callid, &data_len)) {
    … …  
    216216
    217217/** Get function driver name. */
    218 static void devman_fun_get_driver_name(ipc_callid_t iid, ipc_call_t *icall)
     218static void devman_fun_get_driver_name(cap_call_handle_t iid, ipc_call_t *icall)
    219219{
    220220        devman_handle_t handle = IPC_GET_ARG1(*icall);
    … …  
    226226        }
    227227
    228         ipc_callid_t data_callid;
     228        cap_call_handle_t data_callid;
    229229        size_t data_len;
    230230        if (!async_data_read_receive(&data_callid, &data_len)) {
    … …  
    281281
    282282/** Get device path. */
    283 static void devman_fun_get_path(ipc_callid_t iid, ipc_call_t *icall)
     283static void devman_fun_get_path(cap_call_handle_t iid, ipc_call_t *icall)
    284284{
    285285        devman_handle_t handle = IPC_GET_ARG1(*icall);
    … …  
    291291        }
    292292
    293         ipc_callid_t data_callid;
     293        cap_call_handle_t data_callid;
    294294        size_t data_len;
    295295        if (!async_data_read_receive(&data_callid, &data_len)) {
    … …  
    334334
    335335/** Get handle for parent function of a device. */
    336 static void devman_dev_get_parent(ipc_callid_t iid, ipc_call_t *icall)
     336static void devman_dev_get_parent(cap_call_handle_t iid, ipc_call_t *icall)
    337337{
    338338        dev_node_t *dev;
    … …  
    358358}
    359359
    360 static void devman_dev_get_functions(ipc_callid_t iid, ipc_call_t *icall)
    361 {
    362         ipc_callid_t callid;
     360static void devman_dev_get_functions(cap_call_handle_t iid, ipc_call_t *icall)
     361{
     362        cap_call_handle_t callid;
    363363        size_t size;
    364364        size_t act_size;
    … …  
    407407
    408408/** Get handle for child device of a function. */
    409 static void devman_fun_get_child(ipc_callid_t iid, ipc_call_t *icall)
     409static void devman_fun_get_child(cap_call_handle_t iid, ipc_call_t *icall)
    410410{
    411411        fun_node_t *fun;
    … …  
    437437 * of this function is linked to state of another function somehow).
    438438 */
    439 static void devman_fun_online(ipc_callid_t iid, ipc_call_t *icall)
     439static void devman_fun_online(cap_call_handle_t iid, ipc_call_t *icall)
    440440{
    441441        fun_node_t *fun;
    … …  
    462462 * function somehow).
    463463 */
    464 static void devman_fun_offline(ipc_callid_t iid, ipc_call_t *icall)
     464static void devman_fun_offline(cap_call_handle_t iid, ipc_call_t *icall)
    465465{
    466466        fun_node_t *fun;
    … …  
    480480
    481481/** Find handle for the function instance identified by its service ID. */
    482 static void devman_fun_sid_to_handle(ipc_callid_t iid, ipc_call_t *icall)
     482static void devman_fun_sid_to_handle(cap_call_handle_t iid, ipc_call_t *icall)
    483483{
    484484        fun_node_t *fun;
    … …  
    506506
    507507/** Get list of all registered drivers. */
    508 static void devman_get_drivers(ipc_callid_t iid, ipc_call_t *icall)
    509 {
    510         ipc_callid_t callid;
     508static void devman_get_drivers(cap_call_handle_t iid, ipc_call_t *icall)
     509{
     510        cap_call_handle_t callid;
    511511        size_t size;
    512512        size_t act_size;
    … …  
    538538}
    539539
    540 static void devman_driver_get_devices(ipc_callid_t iid, ipc_call_t *icall)
    541 {
    542         ipc_callid_t callid;
     540static void devman_driver_get_devices(cap_call_handle_t iid, ipc_call_t *icall)
     541{
     542        cap_call_handle_t callid;
    543543        size_t size;
    544544        size_t act_size;
    … …  
    580580
    581581/** Find driver by name. */
    582 static void devman_driver_get_handle(ipc_callid_t iid, ipc_call_t *icall)
     582static void devman_driver_get_handle(cap_call_handle_t iid, ipc_call_t *icall)
    583583{
    584584        char *drvname;
    … …  
    603603
    604604/** Get driver match ID. */
    605 static void devman_driver_get_match_id(ipc_callid_t iid, ipc_call_t *icall)
     605static void devman_driver_get_match_id(cap_call_handle_t iid, ipc_call_t *icall)
    606606{
    607607        devman_handle_t handle = IPC_GET_ARG1(*icall);
    … …  
    614614        }
    615615
    616         ipc_callid_t data_callid;
     616        cap_call_handle_t data_callid;
    617617        size_t data_len;
    618618        if (!async_data_read_receive(&data_callid, &data_len)) {
    … …  
    654654
    655655/** Get driver name. */
    656 static void devman_driver_get_name(ipc_callid_t iid, ipc_call_t *icall)
     656static void devman_driver_get_name(cap_call_handle_t iid, ipc_call_t *icall)
    657657{
    658658        devman_handle_t handle = IPC_GET_ARG1(*icall);
    … …  
    664664        }
    665665
    666         ipc_callid_t data_callid;
     666        cap_call_handle_t data_callid;
    667667        size_t data_len;
    668668        if (!async_data_read_receive(&data_callid, &data_len)) {
    … …  
    694694
    695695/** Get driver state. */
    696 static void devman_driver_get_state(ipc_callid_t iid, ipc_call_t *icall)
     696static void devman_driver_get_state(cap_call_handle_t iid, ipc_call_t *icall)
    697697{
    698698        driver_t *drv;
    … …  
    708708
    709709/** Forcibly load a driver. */
    710 static void devman_driver_load(ipc_callid_t iid, ipc_call_t *icall)
     710static void devman_driver_load(cap_call_handle_t iid, ipc_call_t *icall)
    711711{
    712712        driver_t *drv;
    … …  
    727727
    728728/** Unload a driver by user request. */
    729 static void devman_driver_unload(ipc_callid_t iid, ipc_call_t *icall)
     729static void devman_driver_unload(cap_call_handle_t iid, ipc_call_t *icall)
    730730{
    731731        driver_t *drv;
    … …  
    746746
    747747/** Function for handling connections from a client to the device manager. */
    748 void devman_connection_client(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     748void devman_connection_client(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    749749{
    750750        /* Accept connection. */
    … …  
    753753        while (true) {
    754754                ipc_call_t call;
    755                 ipc_callid_t callid = async_get_call(&call);
     755                cap_call_handle_t callid = async_get_call(&call);
    756756
    757757                if (!IPC_GET_IMETHOD(call))

  • uspace/srv/devman/client_conn.h

    readaeae8 r3be9d10  
    3636#include "devman.h"
    3737
    38 extern void devman_connection_client(ipc_callid_t, ipc_call_t *, void *);
     38extern void devman_connection_client(cap_call_handle_t, ipc_call_t *, void *);
    3939
    4040#endif

  • uspace/srv/devman/drv_conn.c

    readaeae8 r3be9d10  
    6464
    6565/** Register running driver. */
    66 static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call)
     66static driver_t *devman_driver_register(cap_call_handle_t callid, ipc_call_t *call)
    6767{
    6868        driver_t *driver = NULL;
    … …  
    166166{
    167167        match_id_t *match_id = create_match_id();
    168         ipc_callid_t callid;
     168        cap_call_handle_t callid;
    169169        ipc_call_t call;
    170170        errno_t rc = 0;
    … …  
    230230 * Child devices are registered by their parent's device driver.
    231231 */
    232 static void devman_add_function(ipc_callid_t callid, ipc_call_t *call)
     232static void devman_add_function(cap_call_handle_t callid, ipc_call_t *call)
    233233{
    234234        fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(*call);
    … …  
    328328}
    329329
    330 static void devman_add_function_to_cat(ipc_callid_t callid, ipc_call_t *call)
     330static void devman_add_function_to_cat(cap_call_handle_t callid, ipc_call_t *call)
    331331{
    332332        devman_handle_t handle = IPC_GET_ARG1(*call);
    … …  
    377377 *
    378378 */
    379 static void devman_drv_fun_online(ipc_callid_t iid, ipc_call_t *icall,
     379static void devman_drv_fun_online(cap_call_handle_t iid, ipc_call_t *icall,
    380380    driver_t *drv)
    381381{
    … …  
    421421 *
    422422 */
    423 static void devman_drv_fun_offline(ipc_callid_t iid, ipc_call_t *icall,
     423static void devman_drv_fun_offline(cap_call_handle_t iid, ipc_call_t *icall,
    424424    driver_t *drv)
    425425{
    … …  
    458458
    459459/** Remove function. */
    460 static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call)
     460static void devman_remove_function(cap_call_handle_t callid, ipc_call_t *call)
    461461{
    462462        devman_handle_t fun_handle = IPC_GET_ARG1(*call);
    … …  
    586586
    587587/** Function for handling connections from a driver to the device manager. */
    588 void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     588void devman_connection_driver(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    589589{
    590590        client_t *client;
    … …  
    602602        while (true) {
    603603                ipc_call_t call;
    604                 ipc_callid_t callid = async_get_call(&call);
     604                cap_call_handle_t callid = async_get_call(&call);
    605605
    606606                if (!IPC_GET_IMETHOD(call))

  • uspace/srv/devman/drv_conn.h

    readaeae8 r3be9d10  
    3737#include "devman.h"
    3838
    39 extern void devman_connection_driver(ipc_callid_t, ipc_call_t *, void *);
     39extern void devman_connection_driver(cap_call_handle_t, ipc_call_t *, void *);
    4040
    4141#endif

  • uspace/srv/devman/main.c

    readaeae8 r3be9d10  
    6666dev_tree_t device_tree;
    6767
    68 static void devman_connection_device(ipc_callid_t iid, ipc_call_t *icall,
     68static void devman_connection_device(cap_call_handle_t iid, ipc_call_t *icall,
    6969    void *arg)
    7070{
    … …  
    149149}
    150150
    151 static void devman_connection_parent(ipc_callid_t iid, ipc_call_t *icall,
     151static void devman_connection_parent(cap_call_handle_t iid, ipc_call_t *icall,
    152152    void *arg)
    153153{
    … …  
    229229}
    230230
    231 static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     231static void devman_forward(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    232232{
    233233        iface_t iface = IPC_GET_ARG1(*icall);
Note: See TracChangeset for help on using the changeset viewer.