Changeset eb13ef8 in mainline for uspace/srv/devman


Ignore:
Timestamp:
2019-02-06T13:25:12Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fafb8e5
Parents:
bb97118
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 14:04:02)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)
Message:

Change IPC_GET_* and IPC_SET_* to accept pointer instead of lvalue

Location:
uspace/srv/devman
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/devman/client_conn.c

    rbb97118 reb13ef8  
    102102static void devman_fun_get_match_id(ipc_call_t *icall)
    103103{
    104         devman_handle_t handle = IPC_GET_ARG1(*icall);
    105         size_t index = IPC_GET_ARG2(*icall);
     104        devman_handle_t handle = IPC_GET_ARG1(icall);
     105        size_t index = IPC_GET_ARG2(icall);
    106106        void *buffer = NULL;
    107107
    … …  
    165165static void devman_fun_get_name(ipc_call_t *icall)
    166166{
    167         devman_handle_t handle = IPC_GET_ARG1(*icall);
     167        devman_handle_t handle = IPC_GET_ARG1(icall);
    168168
    169169        fun_node_t *fun = find_fun_node(&device_tree, handle);
    … …  
    218218static void devman_fun_get_driver_name(ipc_call_t *icall)
    219219{
    220         devman_handle_t handle = IPC_GET_ARG1(*icall);
     220        devman_handle_t handle = IPC_GET_ARG1(icall);
    221221
    222222        fun_node_t *fun = find_fun_node(&device_tree, handle);
    … …  
    283283static void devman_fun_get_path(ipc_call_t *icall)
    284284{
    285         devman_handle_t handle = IPC_GET_ARG1(*icall);
     285        devman_handle_t handle = IPC_GET_ARG1(icall);
    286286
    287287        fun_node_t *fun = find_fun_node(&device_tree, handle);
    … …  
    340340        fibril_rwlock_read_lock(&device_tree.rwlock);
    341341
    342         dev = find_dev_node_no_lock(&device_tree, IPC_GET_ARG1(*icall));
     342        dev = find_dev_node_no_lock(&device_tree, IPC_GET_ARG1(icall));
    343343        if (dev == NULL || dev->state == DEVICE_REMOVED) {
    344344                fibril_rwlock_read_unlock(&device_tree.rwlock);
    … …  
    374374
    375375        dev_node_t *dev = find_dev_node_no_lock(&device_tree,
    376             IPC_GET_ARG1(*icall));
     376            IPC_GET_ARG1(icall));
    377377        if (dev == NULL || dev->state == DEVICE_REMOVED) {
    378378                fibril_rwlock_read_unlock(&device_tree.rwlock);
    … …  
    413413        fibril_rwlock_read_lock(&device_tree.rwlock);
    414414
    415         fun = find_fun_node_no_lock(&device_tree, IPC_GET_ARG1(*icall));
     415        fun = find_fun_node_no_lock(&device_tree, IPC_GET_ARG1(icall));
    416416        if (fun == NULL || fun->state == FUN_REMOVED) {
    417417                fibril_rwlock_read_unlock(&device_tree.rwlock);
    … …  
    442442        errno_t rc;
    443443
    444         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
     444        fun = find_fun_node(&device_tree, IPC_GET_ARG1(icall));
    445445        if (fun == NULL) {
    446446                async_answer_0(icall, ENOENT);
    … …  
    467467        errno_t rc;
    468468
    469         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
     469        fun = find_fun_node(&device_tree, IPC_GET_ARG1(icall));
    470470        if (fun == NULL) {
    471471                async_answer_0(icall, ENOENT);
    … …  
    484484        fun_node_t *fun;
    485485
    486         fun = find_loc_tree_function(&device_tree, IPC_GET_ARG1(*icall));
     486        fun = find_loc_tree_function(&device_tree, IPC_GET_ARG1(icall));
    487487
    488488        if (fun == NULL) {
    … …  
    550550        }
    551551
    552         driver_t *drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
     552        driver_t *drv = driver_find(&drivers_list, IPC_GET_ARG1(icall));
    553553        if (drv == NULL) {
    554554                async_answer_0(&call, ENOENT);
    … …  
    604604static void devman_driver_get_match_id(ipc_call_t *icall)
    605605{
    606         devman_handle_t handle = IPC_GET_ARG1(*icall);
    607         size_t index = IPC_GET_ARG2(*icall);
     606        devman_handle_t handle = IPC_GET_ARG1(icall);
     607        size_t index = IPC_GET_ARG2(icall);
    608608
    609609        driver_t *drv = driver_find(&drivers_list, handle);
    … …  
    655655static void devman_driver_get_name(ipc_call_t *icall)
    656656{
    657         devman_handle_t handle = IPC_GET_ARG1(*icall);
     657        devman_handle_t handle = IPC_GET_ARG1(icall);
    658658
    659659        driver_t *drv = driver_find(&drivers_list, handle);
    … …  
    697697        driver_t *drv;
    698698
    699         drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
     699        drv = driver_find(&drivers_list, IPC_GET_ARG1(icall));
    700700        if (drv == NULL) {
    701701                async_answer_0(icall, ENOENT);
    … …  
    712712        errno_t rc;
    713713
    714         drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
     714        drv = driver_find(&drivers_list, IPC_GET_ARG1(icall));
    715715        if (drv == NULL) {
    716716                async_answer_0(icall, ENOENT);
    … …  
    731731        errno_t rc;
    732732
    733         drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
     733        drv = driver_find(&drivers_list, IPC_GET_ARG1(icall));
    734734        if (drv == NULL) {
    735735                async_answer_0(icall, ENOENT);
    … …  
    754754                async_get_call(&call);
    755755
    756                 if (!IPC_GET_IMETHOD(call)) {
     756                if (!IPC_GET_IMETHOD(&call)) {
    757757                        async_answer_0(&call, EOK);
    758758                        break;
    759759                }
    760760
    761                 switch (IPC_GET_IMETHOD(call)) {
     761                switch (IPC_GET_IMETHOD(&call)) {
    762762                case DEVMAN_DEVICE_GET_HANDLE:
    763763                        devman_function_get_handle(&call);

  • uspace/srv/devman/drv_conn.c

    rbb97118 reb13ef8  
    169169
    170170        async_get_call(&call);
    171         if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
     171        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(&call)) {
    172172                log_msg(LOG_DEFAULT, LVL_ERROR,
    173173                    "Invalid protocol when trying to receive match id.");
    … …  
    185185        async_answer_0(&call, EOK);
    186186
    187         match_id->score = IPC_GET_ARG1(call);
     187        match_id->score = IPC_GET_ARG1(&call);
    188188
    189189        char *match_id_str;
    … …  
    230230static void devman_add_function(ipc_call_t *call)
    231231{
    232         fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(*call);
    233         devman_handle_t dev_handle = IPC_GET_ARG2(*call);
    234         sysarg_t match_count = IPC_GET_ARG3(*call);
     232        fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(call);
     233        devman_handle_t dev_handle = IPC_GET_ARG2(call);
     234        sysarg_t match_count = IPC_GET_ARG3(call);
    235235        dev_tree_t *tree = &device_tree;
    236236
    … …  
    330330static void devman_add_function_to_cat(ipc_call_t *call)
    331331{
    332         devman_handle_t handle = IPC_GET_ARG1(*call);
     332        devman_handle_t handle = IPC_GET_ARG1(call);
    333333        category_id_t cat_id;
    334334        errno_t rc;
    … …  
    385385        log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()");
    386386
    387         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
     387        fun = find_fun_node(&device_tree, IPC_GET_ARG1(icall));
    388388        if (fun == NULL) {
    389389                async_answer_0(icall, ENOENT);
    … …  
    425425        errno_t rc;
    426426
    427         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
     427        fun = find_fun_node(&device_tree, IPC_GET_ARG1(icall));
    428428        if (fun == NULL) {
    429429                async_answer_0(icall, ENOENT);
    … …  
    458458static void devman_remove_function(ipc_call_t *call)
    459459{
    460         devman_handle_t fun_handle = IPC_GET_ARG1(*call);
     460        devman_handle_t fun_handle = IPC_GET_ARG1(call);
    461461        dev_tree_t *tree = &device_tree;
    462462        errno_t rc;
    … …  
    602602                async_get_call(&call);
    603603
    604                 if (!IPC_GET_IMETHOD(call)) {
     604                if (!IPC_GET_IMETHOD(&call)) {
    605605                        async_answer_0(&call, EOK);
    606606                        break;
    607607                }
    608608
    609                 if (IPC_GET_IMETHOD(call) != DEVMAN_DRIVER_REGISTER) {
     609                if (IPC_GET_IMETHOD(&call) != DEVMAN_DRIVER_REGISTER) {
    610610                        fibril_mutex_lock(&client->mutex);
    611611                        driver = client->driver;
    … …  
    618618                }
    619619
    620                 switch (IPC_GET_IMETHOD(call)) {
     620                switch (IPC_GET_IMETHOD(&call)) {
    621621                case DEVMAN_DRIVER_REGISTER:
    622622                        fibril_mutex_lock(&client->mutex);

  • uspace/srv/devman/main.c

    rbb97118 reb13ef8  
    6767static void devman_connection_device(ipc_call_t *icall, void *arg)
    6868{
    69         devman_handle_t handle = IPC_GET_ARG2(*icall);
     69        devman_handle_t handle = IPC_GET_ARG2(icall);
    7070        dev_node_t *dev = NULL;
    7171
    … …  
    149149static void devman_connection_parent(ipc_call_t *icall, void *arg)
    150150{
    151         devman_handle_t handle = IPC_GET_ARG2(*icall);
     151        devman_handle_t handle = IPC_GET_ARG2(icall);
    152152        dev_node_t *dev = NULL;
    153153
    … …  
    228228static void devman_forward(ipc_call_t *icall, void *arg)
    229229{
    230         iface_t iface = IPC_GET_ARG1(*icall);
    231         service_id_t service_id = IPC_GET_ARG2(*icall);
     230        iface_t iface = IPC_GET_ARG1(icall);
     231        service_id_t service_id = IPC_GET_ARG2(icall);
    232232
    233233        fun_node_t *fun = find_loc_tree_function(&device_tree, service_id);
Note: See TracChangeset for help on using the changeset viewer.