Changeset ab87db5 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

• uspace/lib/drv/generic/driver.c (modified) (9 diffs)

uspace/lib/drv/generic/driver.c

@@ -119 +119 @@
 static void driver_dev_add(ipc_call_t *icall)
 {
-        devman_handle_t dev_handle = IPC_GET_ARG1(*icall);
-        devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
+        devman_handle_t dev_handle = ipc_get_arg1(icall);
+        devman_handle_t parent_fun_handle = ipc_get_arg2(icall);
 
         char *dev_name = NULL;
@@ -173 +173 @@
 static void driver_dev_remove(ipc_call_t *icall)
 {
-        devman_handle_t devh = IPC_GET_ARG1(*icall);
+        devman_handle_t devh = ipc_get_arg1(icall);
 
         fibril_mutex_lock(&devices_mutex);
@@ -206 +206 @@
 static void driver_dev_gone(ipc_call_t *icall)
 {
-        devman_handle_t devh = IPC_GET_ARG1(*icall);
+        devman_handle_t devh = ipc_get_arg1(icall);
 
         fibril_mutex_lock(&devices_mutex);
@@ -239 +239 @@
 static void driver_fun_online(ipc_call_t *icall)
 {
-        devman_handle_t funh = IPC_GET_ARG1(*icall);
+        devman_handle_t funh = ipc_get_arg1(icall);
 
         /*
@@ -274 +274 @@
 static void driver_fun_offline(ipc_call_t *icall)
 {
-        devman_handle_t funh = IPC_GET_ARG1(*icall);
+        devman_handle_t funh = ipc_get_arg1(icall);
 
         /*
@@ -343 +343 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case DRIVER_DEV_ADD:
                         driver_dev_add(&call);
@@ -385 +385 @@
          * the device to which the client connected.
          */
-        devman_handle_t handle = IPC_GET_ARG2(*icall);
+        devman_handle_t handle = ipc_get_arg2(icall);
 
         fibril_mutex_lock(&functions_mutex);
@@ -429 +429 @@
                 async_get_call(&call);
 
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                sysarg_t method = ipc_get_imethod(&call);
 
                 if (!method) {
@@ -483 +483 @@
 
                 /* get the method of the remote interface */
-                sysarg_t iface_method_idx = IPC_GET_ARG1(call);
+                sysarg_t iface_method_idx = ipc_get_arg1(&call);
                 remote_iface_func_ptr_t iface_method_ptr =
                     get_remote_method(rem_iface, iface_method_idx);