Changeset a46e56b in mainline for uspace/lib/drv/generic/remote_ahci.c

Timestamp:

2018-03-22T06:49:35Z (7 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

File:

• uspace/lib/drv/generic/remote_ahci.c (modified) (10 diffs)

uspace/lib/drv/generic/remote_ahci.c

@@ -210 +210 @@
 
 void remote_ahci_get_sata_device_name(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface;
 
         if (ahci_iface->get_sata_device_name == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -224 +224 @@
         char* sata_dev_name = malloc(sata_dev_name_length);
         if (sata_dev_name == NULL) {
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 return;
         }
@@ -232 +232 @@
 
         size_t real_size;
-        cap_call_handle_t cid;
-        if ((async_data_read_receive(&cid, &real_size)) &&
+        cap_call_handle_t call_handle;
+        if ((async_data_read_receive(&call_handle, &real_size)) &&
             (real_size == sata_dev_name_length))
-                async_data_read_finalize(cid, sata_dev_name, sata_dev_name_length);
+                async_data_read_finalize(call_handle, sata_dev_name,
+                    sata_dev_name_length);
 
         free(sata_dev_name);
-        async_answer_0(callid, ret);
+        async_answer_0(chandle, ret);
 }
 
 static void remote_ahci_get_num_blocks(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface;
 
         if (ahci_iface->get_num_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -255 +256 @@
 
         if (ret != EOK)
-                async_answer_0(callid, ret);
+                async_answer_0(chandle, ret);
         else
-                async_answer_2(callid, EOK, HI(blocks), LO(blocks));
+                async_answer_2(chandle, EOK, HI(blocks), LO(blocks));
 }
 
 static void remote_ahci_get_block_size(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface;
 
         if (ahci_iface->get_block_size == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -274 +275 @@
 
         if (ret != EOK)
-                async_answer_0(callid, ret);
+                async_answer_0(chandle, ret);
         else
-                async_answer_1(callid, EOK, blocks);
+                async_answer_1(chandle, EOK, blocks);
 }
 
 void remote_ahci_read_blocks(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface;
 
         if (ahci_iface->read_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -292 +293 @@
         unsigned int flags;
 
-        cap_call_handle_t cid;
-        async_share_out_receive(&cid, &maxblock_size, &flags);
+        cap_call_handle_t call_handle;
+        async_share_out_receive(&call_handle, &maxblock_size, &flags);
 
         void *buf;
-        async_share_out_finalize(cid, &buf);
+        async_share_out_finalize(call_handle, &buf);
 
         const uint64_t blocknum =
@@ -305 +306 @@
         const errno_t ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
 
-        async_answer_0(callid, ret);
-}
-
-void remote_ahci_write_blocks(ddf_fun_t *fun, void *iface, cap_call_handle_t callid,
+        async_answer_0(chandle, ret);
+}
+
+void remote_ahci_write_blocks(ddf_fun_t *fun, void *iface, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -314 +315 @@
 
         if (ahci_iface->read_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -321 +322 @@
         unsigned int flags;
 
-        cap_call_handle_t cid;
-        async_share_out_receive(&cid, &maxblock_size, &flags);
+        cap_call_handle_t call_handle;
+        async_share_out_receive(&call_handle, &maxblock_size, &flags);
 
         void *buf;
-        async_share_out_finalize(cid, &buf);
+        async_share_out_finalize(call_handle, &buf);
 
         const uint64_t blocknum =
@@ -334 +335 @@
         const errno_t ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf);
 
-        async_answer_0(callid, ret);
+        async_answer_0(chandle, ret);
 }