Changeset a46e56b in mainline for uspace/lib/c/generic/io/chardev_srv.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/c/generic/io/chardev_srv.c (modified) (10 diffs)

uspace/lib/c/generic/io/chardev_srv.c

@@ -43 +43 @@
 static chardev_srv_t *chardev_srv_create(chardev_srvs_t *);
 
-static void chardev_read_srv(chardev_srv_t *srv, cap_call_handle_t callid,
+static void chardev_read_srv(chardev_srv_t *srv, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -50 +50 @@
         size_t nread;
         errno_t rc;
-        cap_call_handle_t rcallid;
+        cap_call_handle_t rcall_handle;
 
-        if (!async_data_read_receive(&rcallid, &size)) {
-                async_answer_0(callid, EINVAL);
+        if (!async_data_read_receive(&rcall_handle, &size)) {
+                async_answer_0(chandle, EINVAL);
                 return;
         }
@@ -59 +59 @@
         buf = malloc(size);
         if (buf == NULL) {
-                async_answer_0(rcallid, ENOMEM);
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(rcall_handle, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 return;
         }
 
         if (srv->srvs->ops->read == NULL) {
-                async_answer_0(rcallid, ENOTSUP);
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(rcall_handle, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 free(buf);
                 return;
@@ -73 +73 @@
         rc = srv->srvs->ops->read(srv, buf, size, &nread);
         if (rc != EOK && nread == 0) {
-                async_answer_0(rcallid, rc);
-                async_answer_0(callid, rc);
+                async_answer_0(rcall_handle, rc);
+                async_answer_0(chandle, rc);
                 free(buf);
                 return;
         }
 
-        async_data_read_finalize(rcallid, buf, nread);
+        async_data_read_finalize(rcall_handle, buf, nread);
 
         free(buf);
-        async_answer_2(callid, EOK, (sysarg_t) rc, nread);
+        async_answer_2(chandle, EOK, (sysarg_t) rc, nread);
 }
 
-static void chardev_write_srv(chardev_srv_t *srv, cap_call_handle_t callid,
+static void chardev_write_srv(chardev_srv_t *srv, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -95 +95 @@
         rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
         if (rc != EOK) {
-                async_answer_0(callid, rc);
+                async_answer_0(chandle, rc);
                 return;
         }
 
         if (srv->srvs->ops->write == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -107 +107 @@
         free(data);
         if (rc != EOK && nwr == 0) {
-                async_answer_0(callid, rc);
+                async_answer_0(chandle, rc);
                 return;
         }
 
-        async_answer_2(callid, EOK, (sysarg_t) rc, nwr);
+        async_answer_2(chandle, EOK, (sysarg_t) rc, nwr);
 }
 
@@ -132 +132 @@
 }
 
-errno_t chardev_conn(cap_call_handle_t iid, ipc_call_t *icall, chardev_srvs_t *srvs)
+errno_t chardev_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, chardev_srvs_t *srvs)
 {
         chardev_srv_t *srv;
@@ -138 +138 @@
 
         /* Accept the connection */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         srv = chardev_srv_create(srvs);
@@ -152 +152 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up */
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         break;
                 }
@@ -163 +163 @@
                 switch (method) {
                 case CHARDEV_READ:
-                        chardev_read_srv(srv, callid, &call);
+                        chardev_read_srv(srv, chandle, &call);
                         break;
                 case CHARDEV_WRITE:
-                        chardev_write_srv(srv, callid, &call);
+                        chardev_write_srv(srv, chandle, &call);
                         break;
                 default:
                         if (srv->srvs->ops->def_handler != NULL)
-                                srv->srvs->ops->def_handler(srv, callid, &call);
+                                srv->srvs->ops->def_handler(srv, chandle, &call);
                         else
-                                async_answer_0(callid, ENOTSUP);
+                                async_answer_0(chandle, ENOTSUP);
                 }
         }