Changeset a46e56b in mainline for uspace/drv/char

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

Files:

• i8042/i8042.c (modified) (1 diff)
• msim-con/msim-con.c (modified) (2 diffs)
• ns8250/ns8250.c (modified) (3 diffs)
• pl050/pl050.c (modified) (1 diff)
• ski-con/ski-con.c (modified) (2 diffs)
• sun4v-con/sun4v-con.c (modified) (2 diffs)

uspace/drv/char/i8042/i8042.c

@@ -414 +414 @@
 /** Handle data requests.
  *
- * @param id   callid
+ * @param id   chandle
  * @param call IPC request.
  * @param arg  ddf_fun_t function.
  */
-void i8042_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+void i8042_char_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         i8042_port_t *port = ddf_fun_data_get((ddf_fun_t *)arg);
 
-        chardev_conn(iid, icall, &port->cds);
+        chardev_conn(icall_handle, icall, &port->cds);
 }
 

uspace/drv/char/msim-con/msim-con.c

@@ -217 +217 @@
 
 /** Character device connection handler. */
-static void msim_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void msim_con_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -223 +223 @@
             ddf_fun_get_dev((ddf_fun_t *) arg));
 
-        chardev_conn(iid, icall, &con->cds);
+        chardev_conn(icall_handle, icall, &con->cds);
 }
 

uspace/drv/char/ns8250/ns8250.c

@@ -1068 +1068 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(chardev_srv_t *srv, cap_call_handle_t callid,
+static void ns8250_default_handler(chardev_srv_t *srv, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -1080 +1080 @@
                 ns8250_get_props(ns8250->dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
-                async_answer_4(callid, EOK, baud_rate, parity, word_length,
+                async_answer_4(chandle, EOK, baud_rate, parity, word_length,
                     stop_bits);
                 break;
@@ -1091 +1091 @@
                 ret = ns8250_set_props(ns8250->dev, baud_rate, parity, word_length,
                     stop_bits);
-                async_answer_0(callid, ret);
+                async_answer_0(chandle, ret);
                 break;
 
         default:
-                async_answer_0(callid, ENOTSUP);
-        }
-}
-
-void ns8250_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+                async_answer_0(chandle, ENOTSUP);
+        }
+}
+
+void ns8250_char_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         ns8250_t *ns8250 = fun_ns8250((ddf_fun_t *)arg);
 
-        chardev_conn(iid, icall, &ns8250->cds);
+        chardev_conn(icall_handle, icall, &ns8250->cds);
 }
 

uspace/drv/char/pl050/pl050.c

@@ -286 +286 @@
 }
 
-void pl050_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+void pl050_char_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         pl050_t *pl050 = pl050_from_fun((ddf_fun_t *)arg);
 
-        chardev_conn(iid, icall, &pl050->cds);
+        chardev_conn(icall_handle, icall, &pl050->cds);
 }
 

uspace/drv/char/ski-con/ski-con.c

@@ -255 +255 @@
 
 /** Character device connection handler. */
-static void ski_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void ski_con_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -261 +261 @@
             ddf_fun_get_dev((ddf_fun_t *) arg));
 
-        chardev_conn(iid, icall, &con->cds);
+        chardev_conn(icall_handle, icall, &con->cds);
 }
 

uspace/drv/char/sun4v-con/sun4v-con.c

@@ -180 +180 @@
 
 /** Character device connection handler. */
-static void sun4v_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void sun4v_con_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -186 +186 @@
             ddf_fun_get_dev((ddf_fun_t *) arg));
 
-        chardev_conn(iid, icall, &con->cds);
+        chardev_conn(icall_handle, icall, &con->cds);
 }