Changes in uspace/srv/devman/drv_conn.c [fafb8e5:f89204ee] in mainline

File:

• uspace/srv/devman/drv_conn.c (modified) (9 diffs)

uspace/srv/devman/drv_conn.c

@@ -169 +169 @@
 
         async_get_call(&call);
-        if (DEVMAN_ADD_MATCH_ID != ipc_get_imethod(&call)) {
+        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Invalid protocol when trying to receive match id.");
@@ -185 +185 @@
         async_answer_0(&call, EOK);
 
-        match_id->score = ipc_get_arg1(&call);
+        match_id->score = IPC_GET_ARG1(call);
 
         char *match_id_str;
@@ -230 +230 @@
 static void devman_add_function(ipc_call_t *call)
 {
-        fun_type_t ftype = (fun_type_t) ipc_get_arg1(call);
-        devman_handle_t dev_handle = ipc_get_arg2(call);
-        sysarg_t match_count = ipc_get_arg3(call);
+        fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(*call);
+        devman_handle_t dev_handle = IPC_GET_ARG2(*call);
+        sysarg_t match_count = IPC_GET_ARG3(*call);
         dev_tree_t *tree = &device_tree;
 
@@ -330 +330 @@
 static void devman_add_function_to_cat(ipc_call_t *call)
 {
-        devman_handle_t handle = ipc_get_arg1(call);
+        devman_handle_t handle = IPC_GET_ARG1(*call);
         category_id_t cat_id;
         errno_t rc;
@@ -385 +385 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()");
 
-        fun = find_fun_node(&device_tree, ipc_get_arg1(icall));
+        fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
         if (fun == NULL) {
                 async_answer_0(icall, ENOENT);
@@ -425 +425 @@
         errno_t rc;
 
-        fun = find_fun_node(&device_tree, ipc_get_arg1(icall));
+        fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
         if (fun == NULL) {
                 async_answer_0(icall, ENOENT);
@@ -458 +458 @@
 static void devman_remove_function(ipc_call_t *call)
 {
-        devman_handle_t fun_handle = ipc_get_arg1(call);
+        devman_handle_t fun_handle = IPC_GET_ARG1(*call);
         dev_tree_t *tree = &device_tree;
         errno_t rc;
@@ -602 +602 @@
                 async_get_call(&call);
 
-                if (!ipc_get_imethod(&call)) {
+                if (!IPC_GET_IMETHOD(call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                if (ipc_get_imethod(&call) != DEVMAN_DRIVER_REGISTER) {
+                if (IPC_GET_IMETHOD(call) != DEVMAN_DRIVER_REGISTER) {
                         fibril_mutex_lock(&client->mutex);
                         driver = client->driver;
@@ -618 +618 @@
                 }
 
-                switch (ipc_get_imethod(&call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case DEVMAN_DRIVER_REGISTER:
                         fibril_mutex_lock(&client->mutex);