Changeset a46e56b in mainline for uspace/srv/net/ethip/ethip_nic.c

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

File:

• uspace/srv/net/ethip/ethip_nic.c (modified) (6 diffs)

uspace/srv/net/ethip/ethip_nic.c

@@ -52 +52 @@
 
 static errno_t ethip_nic_open(service_id_t sid);
-static void ethip_nic_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
+static void ethip_nic_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
 
 static LIST_INITIALIZE(ethip_nic_list);
@@ -229 +229 @@
 }
 
-static void ethip_nic_addr_changed(ethip_nic_t *nic, cap_call_handle_t callid,
+static void ethip_nic_addr_changed(ethip_nic_t *nic, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -255 +255 @@
 
         free(addr);
-        async_answer_0(callid, EOK);
-}
-
-static void ethip_nic_received(ethip_nic_t *nic, cap_call_handle_t callid,
+        async_answer_0(chandle, EOK);
+}
+
+static void ethip_nic_received(ethip_nic_t *nic, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -282 +282 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_received() done, rc=%s", str_error_name(rc));
-        async_answer_0(callid, rc);
-}
-
-static void ethip_nic_device_state(ethip_nic_t *nic, cap_call_handle_t callid,
+        async_answer_0(chandle, rc);
+}
+
+static void ethip_nic_device_state(ethip_nic_t *nic, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_device_state()");
-        async_answer_0(callid, ENOTSUP);
-}
-
-static void ethip_nic_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+        async_answer_0(chandle, ENOTSUP);
+}
+
+static void ethip_nic_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         ethip_nic_t *nic = (ethip_nic_t *)arg;
@@ -300 +300 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -309 +309 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case NIC_EV_ADDR_CHANGED:
-                        ethip_nic_addr_changed(nic, callid, &call);
+                        ethip_nic_addr_changed(nic, chandle, &call);
                         break;
                 case NIC_EV_RECEIVED:
-                        ethip_nic_received(nic, callid, &call);
+                        ethip_nic_received(nic, chandle, &call);
                         break;
                 case NIC_EV_DEVICE_STATE:
-                        ethip_nic_device_state(nic, callid, &call);
+                        ethip_nic_device_state(nic, chandle, &call);
                         break;
                 default:
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "unknown IPC method: %" PRIun, IPC_GET_IMETHOD(call));
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(chandle, ENOTSUP);
                 }
         }