Changeset 984a9ba in mainline for uspace/drv/intctl/obio/obio.c

Timestamp:

2018-07-05T09:34:09Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

File:

• uspace/drv/intctl/obio/obio.c (modified) (3 diffs)

uspace/drv/intctl/obio/obio.c

@@ -69 +69 @@
 /** Handle one connection to obio.
  *
- * @param iid           Hash of the request that opened the connection.
- * @param icall         Call data of the request that opened the connection.
- * @param arg           Local argument.
+ * @param icall Call data of the request that opened the connection.
+ * @param arg   Local argument.
+ *
  */
-static void obio_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void obio_connection(ipc_call_t *icall, void *arg)
 {
-        cap_call_handle_t chandle;
         ipc_call_t call;
         obio_t *obio;
@@ -82 +81 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
-        obio = (obio_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
+        obio = (obio_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
 
         while (true) {
                 int inr;
 
-                chandle = async_get_call(&call);
+                async_get_call(&call);
+
                 switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
@@ -95 +95 @@
                         pio_set_64(&obio->regs[OBIO_IMR(inr & INO_MASK)],
                             1UL << 31, 0);
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         break;
                 case IRC_DISABLE_INTERRUPT:
                         /* XXX TODO */
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         break;
                 case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
                         pio_write_64(&obio->regs[OBIO_CIR(inr & INO_MASK)], 0);
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         break;
                 default:
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(&call, EINVAL);
                         break;
                 }