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

uspace/lib/drv/generic/remote_usbhid.c

@@ -309 +309 @@
 
 void remote_usbhid_get_event_length(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         printf("remote_usbhid_get_event_length()\n");
@@ -317 +317 @@
         if (!hid_iface->get_event_length) {
                 printf("Get event length not set!\n");
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -325 +325 @@
 //              len = EEMPTY;
 //      }
-        async_answer_1(callid, EOK, len);
+        async_answer_1(chandle, EOK, len);
 
 //      if (len < 0) {
-//              async_answer_0(callid, len);
+//              async_answer_0(chandle, len);
 //      } else {
-//              async_answer_1(callid, EOK, len);
+//              async_answer_1(chandle, EOK, len);
 //      }
 }
 
 void remote_usbhid_get_event(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface;
 
         if (!hid_iface->get_event) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
@@ -347 +347 @@
 
         size_t len;
-        cap_call_handle_t data_callid;
-        if (!async_data_read_receive(&data_callid, &len)) {
-                async_answer_0(callid, EPARTY);
+        cap_call_handle_t data_chandle;
+        if (!async_data_read_receive(&data_chandle, &len)) {
+                async_answer_0(chandle, EPARTY);
                 return;
         }
@@ -357 +357 @@
 //      }
         if (len == 0) {
-                async_answer_0(data_callid, EINVAL);
-                async_answer_0(callid, EINVAL);
+                async_answer_0(data_chandle, EINVAL);
+                async_answer_0(chandle, EINVAL);
                 return;
         }
@@ -366 +366 @@
         uint8_t *data = malloc(len);
         if (data == NULL) {
-                async_answer_0(data_callid, ENOMEM);
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(data_chandle, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 return;
         }
@@ -376 +376 @@
         if (rc != EOK) {
                 free(data);
-                async_answer_0(data_callid, rc);
-                async_answer_0(callid, rc);
+                async_answer_0(data_chandle, rc);
+                async_answer_0(chandle, rc);
                 return;
         }
@@ -386 +386 @@
         }
 
-        async_data_read_finalize(data_callid, data, act_length);
+        async_data_read_finalize(data_chandle, data, act_length);
 
         free(data);
 
-        async_answer_1(callid, EOK, event_nr);
+        async_answer_1(chandle, EOK, event_nr);
 }
 
 void remote_usbhid_get_report_descriptor_length(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface;
 
         if (!hid_iface->get_report_descriptor_length) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
 
         size_t len = hid_iface->get_report_descriptor_length(fun);
-        async_answer_1(callid, EOK, (sysarg_t) len);
+        async_answer_1(chandle, EOK, (sysarg_t) len);
 }
 
 void remote_usbhid_get_report_descriptor(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t callid, ipc_call_t *call)
+    cap_call_handle_t chandle, ipc_call_t *call)
 {
         usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface;
 
         if (!hid_iface->get_report_descriptor) {
-                async_answer_0(callid, ENOTSUP);
+                async_answer_0(chandle, ENOTSUP);
                 return;
         }
 
         size_t len;
-        cap_call_handle_t data_callid;
-        if (!async_data_read_receive(&data_callid, &len)) {
-                async_answer_0(callid, EINVAL);
+        cap_call_handle_t data_chandle;
+        if (!async_data_read_receive(&data_chandle, &len)) {
+                async_answer_0(chandle, EINVAL);
                 return;
         }
 
         if (len == 0) {
-                async_answer_0(data_callid, EINVAL);
-                async_answer_0(callid, EINVAL);
+                async_answer_0(data_chandle, EINVAL);
+                async_answer_0(chandle, EINVAL);
                 return;
         }
@@ -432 +432 @@
         uint8_t *descriptor = malloc(len);
         if (descriptor == NULL) {
-                async_answer_0(data_callid, ENOMEM);
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(data_chandle, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 return;
         }
@@ -445 +445 @@
         if (rc != EOK) {
                 free(descriptor);
-                async_answer_0(data_callid, rc);
-                async_answer_0(callid, rc);
-                return;
-        }
-
-        async_data_read_finalize(data_callid, descriptor, act_len);
-        async_answer_0(callid, EOK);
+                async_answer_0(data_chandle, rc);
+                async_answer_0(chandle, rc);
+                return;
+        }
+
+        async_data_read_finalize(data_chandle, descriptor, act_len);
+        async_answer_0(chandle, EOK);
 
         free(descriptor);