Changeset a46e56b in mainline for uspace/drv/bus

Timestamp:

2018-03-22T06:49:35Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

77f0a1d

Parents:

3e242d2

git-author:

Jakub Jermar <jakub@…> (2018-03-21 23:29:06)

git-committer:

Jakub Jermar <jakub@…> (2018-03-22 06:49:35)

Message:

Prefer handle over ID in naming handle variables

Location:

uspace/drv/bus

Files:

• adb/cuda_adb/cuda_adb.c (modified) (2 diffs)
• usb/vhc/conndev.c (modified) (3 diffs)
• usb/vhc/vhcd.h (modified) (1 diff)

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

@@ -198 +198 @@
 
 /** Device connection handler */
-static void cuda_dev_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void cuda_dev_connection(cap_call_handle_t icall_handle,
+    ipc_call_t *icall, void *arg)
 {
         adb_dev_t *dev = (adb_dev_t *) ddf_fun_data_get((ddf_fun_t *) arg);
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         ipc_call_t call;
         sysarg_t method;
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         while (true) {
-                callid = async_get_call(&call);
+                chandle = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up. */
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         return;
                 }
@@ -222 +223 @@
                 if (sess != NULL) {
                         dev->client_sess = sess;
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                 } else {
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                 }
         }

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

@@ -90 +90 @@
  *
  * @param fun Device handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
+void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -104 +104 @@
                 errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
                 if (rc != EOK) {
-                        async_answer_0(icallid, rc);
+                        async_answer_0(icall_handle, rc);
                         async_hangup(callback);
                         return;
                 }
 
-                async_answer_0(icallid, EOK);
+                async_answer_0(icall_handle, EOK);
 
                 receive_device_name(callback);
@@ -116 +116 @@
                     plugged_device_name, plugged_device_handle);
         } else
-                async_answer_0(icallid, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
 }
 

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

@@ -88 +88 @@
 
 void on_client_close(ddf_fun_t *fun);
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
+void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     ipc_call_t *icall);