Changeset 984a9ba in mainline for uspace/drv/block

Timestamp:

2018-07-05T09:34:09Z (7 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.

Location:

uspace/drv/block

Files:

• ata_bd/main.c (modified) (2 diffs)
• ddisk/ddisk.c (modified) (3 diffs)
• usbmast/main.c (modified) (2 diffs)

uspace/drv/block/ata_bd/main.c

@@ -47 +47 @@
 static errno_t ata_fun_offline(ddf_fun_t *fun);
 
-static void ata_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
+static void ata_bd_connection(ipc_call_t *, void *);
 
 static driver_ops_t driver_ops = {
@@ -313 +313 @@
 
 /** Block device connection handler */
-static void ata_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void ata_bd_connection(ipc_call_t *icall, void *arg)
 {
         ata_fun_t *afun;
 
         afun = (ata_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
-        bd_conn(icall_handle, icall, &afun->bds);
+        bd_conn(icall, &afun->bds);
 }
 

uspace/drv/block/ddisk/ddisk.c

@@ -62 +62 @@
 static errno_t ddisk_fun_offline(ddf_fun_t *);
 
-static void ddisk_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
+static void ddisk_bd_connection(ipc_call_t *, void *);
 
 static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
@@ -585 +585 @@
 
 /** Block device connection handler */
-static void ddisk_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void ddisk_bd_connection(ipc_call_t *icall, void *arg)
 {
         ddisk_t *ddisk;
@@ -591 +591 @@
 
         ddisk = (ddisk_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
-        bd_conn(icall_handle, icall, &ddisk->bds);
+        bd_conn(icall, &ddisk->bds);
 }
 

uspace/drv/block/usbmast/main.c

@@ -79 +79 @@
 
 static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
-static void usbmast_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
-    void *arg);
+static void usbmast_bd_connection(ipc_call_t *icall, void *arg);
 
 static errno_t usbmast_bd_open(bd_srvs_t *, bd_srv_t *);
@@ -317 +316 @@
 
 /** Blockdev client connection handler. */
-static void usbmast_bd_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
-    void *arg)
+static void usbmast_bd_connection(ipc_call_t *icall, void *arg)
 {
         usbmast_fun_t *mfun;
 
         mfun = (usbmast_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
-        bd_conn(icall_handle, icall, &mfun->bds);
+        bd_conn(icall, &mfun->bds);
 }