Changeset eed4139 in mainline for uspace/lib

Timestamp:

2018-03-22T23:23:18Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cbb37b6

Parents:

77f0a1d

Message:

Fix some comments mentioning 'call IDs'

Location:

uspace/lib

Files:

• c/generic/inet/tcp.c (modified) (7 diffs)
• hound/src/protocol.c (modified) (1 diff)
• nic/src/nic_impl.c (modified) (2 diffs)

uspace/lib/c/generic/inet/tcp.c

@@ -633 +633 @@
 /** Connection established event.
  *
- * @param tcp TCP client
- * @param iid Call ID
- * @param icall Call data
- */
-static void tcp_ev_connected(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
+ * @param tcp           TCP client
+ * @param icall_handle  Call handle
+ * @param icall         Call data
+ */
+static void
+tcp_ev_connected(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         tcp_conn_t *conn;
@@ -661 +662 @@
 /** Connection failed event.
  *
- * @param tcp TCP client
- * @param iid Call ID
- * @param icall Call data
- */
-static void tcp_ev_conn_failed(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
+ * @param tcp           TCP client
+ * @param icall_handle  Call handle
+ * @param icall         Call data
+ */
+static void
+tcp_ev_conn_failed(tcp_t *tcp, cap_call_handle_t icall_handle,
+    ipc_call_t *icall)
 {
         tcp_conn_t *conn;
@@ -689 +692 @@
 /** Connection reset event.
  *
- * @param tcp TCP client
- * @param iid Call ID
- * @param icall Call data
+ * @param tcp           TCP client
+ * @param icall_handle  Call handle
+ * @param icall         Call data
  */
 static void tcp_ev_conn_reset(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
@@ -717 +720 @@
 /** Data available event.
  *
- * @param tcp TCP client
- * @param iid Call ID
- * @param icall Call data
- */
-static void tcp_ev_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
+ * @param tcp           TCP client
+ * @param icall_handle  Call handle 
+ * @param icall         Call data
+ */
+static void
+tcp_ev_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         tcp_conn_t *conn;
@@ -746 +750 @@
 /** Urgent data event.
  *
- * @param tcp TCP client
- * @param iid Call ID
- * @param icall Call data
- */
-static void tcp_ev_urg_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
+ * @param tcp           TCP client
+ * @param icall_handle  Call handle
+ * @param icall         Call data
+ */
+static void
+tcp_ev_urg_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         async_answer_0(icall_handle, ENOTSUP);
@@ -757 +762 @@
 /** New connection event.
  *
- * @param tcp TCP client
- * @param iid Call ID
- * @param icall Call data
- */
-static void tcp_ev_new_conn(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
+ * @param tcp           TCP client
+ * @param icall_handle  Call handle
+ * @param icall         Call data
+ */
+static void
+tcp_ev_new_conn(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         tcp_listener_t *lst;
@@ -809 +815 @@
 /** Callback connection handler.
  *
- * @param iid Connect call ID
- * @param icall Connect call data
- * @param arg Argument, TCP client
- */
-static void tcp_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+ * @param icall_handle  Connect call handle
+ * @param icall         Connect call data
+ * @param arg           Argument, TCP client
+ */
+static void
+tcp_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         tcp_t *tcp = (tcp_t *)arg;

uspace/lib/hound/src/protocol.c

@@ -378 +378 @@
 }
 
-/**
- * Server side implementation of the hound protocol. IPC connection handler.
- * @param iid initial call id
- * @param icall pointer to initial call structure.
- * @param arg (unused)
- */
-void hound_connection_handler(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+/** Server side implementation of the hound protocol. IPC connection handler.
+ *
+ * @param icall_handle   Initial call handle
+ * @param icall          Pointer to initial call structure.
+ * @param arg            (unused)
+ */
+void hound_connection_handler(cap_call_handle_t icall_handle, ipc_call_t *icall,
+    void *arg)
 {
         hound_context_id_t id;

uspace/lib/nic/src/nic_impl.c

@@ -783 +783 @@
  * @return EINVAL       If the NIC is not in state where it allows on demand polling
  */
-errno_t nic_poll_now_impl(ddf_fun_t *fun) {
+errno_t nic_poll_now_impl(ddf_fun_t *fun)
+{
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
         fibril_rwlock_read_lock(&nic_data->main_lock);
@@ -804 +805 @@
  * Logs a warning message and returns ENOTSUP to the caller.
  *
- * @param fun           The DDF function where the method should be called.
- * @param chandle       IPC call identifier
- * @param call          IPC call data
+ * @param fun      The DDF function where the method should be called.
+ * @param chandle  IPC call handle
+ * @param call     IPC call data
  */
 void nic_default_handler_impl(ddf_fun_t *fun, cap_call_handle_t chandle,