Changeset a46e56b in mainline for uspace/drv/block

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/block

Files:

• ata_bd/main.c (modified) (1 diff)
• ddisk/ddisk.c (modified) (2 diffs)
• usbmast/main.c (modified) (3 diffs)

uspace/drv/block/ata_bd/main.c

@@ -313 +313 @@
 
 /** Block device connection handler */
-static void ata_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void ata_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         ata_fun_t *afun;
 
         afun = (ata_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
-        bd_conn(iid, icall, &afun->bds);
+        bd_conn(icall_handle, icall, &afun->bds);
 }
 

uspace/drv/block/ddisk/ddisk.c

@@ -587 +587 @@
 
 /** Block device connection handler */
-static void ddisk_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void ddisk_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         ddisk_t *ddisk;
@@ -593 +593 @@
 
         ddisk = (ddisk_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
-        bd_conn(iid, icall, &ddisk->bds);
+        bd_conn(icall_handle, icall, &ddisk->bds);
 }
 

uspace/drv/block/usbmast/main.c

@@ -79 +79 @@
 
 static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
-static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void usbmast_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg);
 
@@ -317 +317 @@
 
 /** Blockdev client connection handler. */
-static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void usbmast_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -323 +323 @@
 
         mfun = (usbmast_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
-        bd_conn(iid, icall, &mfun->bds);
+        bd_conn(icall_handle, icall, &mfun->bds);
 }