Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3) +++ uspace/srv/devman/devman.c (revision 79ae36ddc409577eb0da3750b3a7280e034566a2) @@ -564,5 +564,4 @@ dev_node_t *dev; link_t *link; - int phone; log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")", @@ -570,8 +569,11 @@ fibril_mutex_lock(&driver->driver_mutex); - - phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0); - - if (phone < 0) { + + async_exch_t *exch = async_exchange_begin(driver->sess); + async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch, + DRIVER_DEVMAN, 0, 0); + async_exchange_end(exch); + + if (!sess) { fibril_mutex_unlock(&driver->driver_mutex); return; @@ -602,5 +604,5 @@ fibril_mutex_unlock(&driver->driver_mutex); - add_device(phone, driver, dev, tree); + add_device(sess, driver, dev, tree); /* @@ -623,5 +625,5 @@ } - async_hangup(phone); + async_hangup(sess); /* @@ -673,5 +675,5 @@ list_initialize(&drv->devices); fibril_mutex_initialize(&drv->driver_mutex); - drv->phone = -1; + drv->sess = NULL; } @@ -737,5 +739,6 @@ * @param node The device's node in the device tree. */ -void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree) +void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev, + dev_tree_t *tree) { /* @@ -746,7 +749,4 @@ drv->name, dev->pfun->name); - sysarg_t rc; - ipc_call_t answer; - /* Send the device to the driver. */ devman_handle_t parent_handle; @@ -756,11 +756,17 @@ parent_handle = 0; } - - aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, dev->handle, + + async_exch_t *exch = async_exchange_begin(sess); + + ipc_call_t answer; + aid_t req = async_send_2(exch, DRIVER_ADD_DEVICE, dev->handle, parent_handle, &answer); - /* Send the device's name to the driver. */ - rc = async_data_write_start(phone, dev->pfun->name, + /* Send the device name to the driver. */ + sysarg_t rc = async_data_write_start(exch, dev->pfun->name, str_size(dev->pfun->name) + 1); + + async_exchange_end(exch); + if (rc != EOK) { /* TODO handle error */ @@ -823,8 +829,12 @@ if (is_running) { /* Notify the driver about the new device. */ - int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0); - if (phone >= 0) { - add_device(phone, drv, dev, tree); - async_hangup(phone); + async_exch_t *exch = async_exchange_begin(drv->sess); + async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch, + DRIVER_DEVMAN, 0, 0); + async_exchange_end(exch); + + if (sess) { + add_device(sess, drv, dev, tree); + async_hangup(sess); } } Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3) +++ uspace/srv/devman/devman.h (revision 79ae36ddc409577eb0da3750b3a7280e034566a2) @@ -44,4 +44,5 @@ #include #include +#include #include "util.h" @@ -87,6 +88,6 @@ int state; - /** Phone asociated with this driver. */ - int phone; + /** Session asociated with this driver. */ + async_sess_t *sess; /** Name of the device driver. */ char *name; @@ -99,5 +100,5 @@ /** - * Fibril mutex for this driver - driver state, list of devices, phone. + * Fibril mutex for this driver - driver state, list of devices, session. */ fibril_mutex_t driver_mutex; @@ -312,5 +313,5 @@ extern void add_driver(driver_list_t *, driver_t *); extern void attach_driver(dev_node_t *, driver_t *); -extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *); +extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *); extern bool start_driver(driver_t *); Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3) +++ uspace/srv/devman/main.c (revision 79ae36ddc409577eb0da3750b3a7280e034566a2) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include @@ -108,5 +108,5 @@ fibril_mutex_lock(&driver->driver_mutex); - if (driver->phone >= 0) { + if (driver->sess) { /* We already have a connection to the driver. */ log_msg(LVL_ERROR, "Driver '%s' already started.\n", @@ -128,5 +128,5 @@ break; case DRIVER_RUNNING: - /* Should not happen since we do not have a connected phone */ + /* Should not happen since we do not have a connected session */ assert(false); } @@ -135,23 +135,17 @@ log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.", driver->name); - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) { + driver->sess = async_callback_receive(EXCHANGE_SERIALIZE); + if (!driver->sess) { fibril_mutex_unlock(&driver->driver_mutex); - async_answer_0(callid, ENOTSUP); async_answer_0(iid, ENOTSUP); return NULL; } - /* Remember driver's phone. */ - driver->phone = IPC_GET_ARG5(call); - fibril_mutex_unlock(&driver->driver_mutex); - log_msg(LVL_NOTE, + log_msg(LVL_NOTE, "The `%s' driver was successfully registered as running.", driver->name); - async_answer_0(callid, EOK); async_answer_0(iid, EOK); @@ -434,14 +428,12 @@ fibril_add_ready(fid); - ipc_callid_t callid; - ipc_call_t call; - bool cont = true; - while (cont) { - callid = async_get_call(&call); + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) + break; switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - cont = false; - continue; case DEVMAN_ADD_FUNCTION: devman_add_function(callid, &call); @@ -559,13 +551,12 @@ async_answer_0(iid, EOK); - bool cont = true; - while (cont) { + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); + if (!IPC_GET_IMETHOD(call)) + break; + switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - cont = false; - continue; case DEVMAN_DEVICE_GET_HANDLE: devman_function_get_handle(callid, &call); @@ -635,6 +626,5 @@ if (driver == NULL) { log_msg(LVL_ERROR, "IPC forwarding refused - " \ - "the device %" PRIun "(%s) is not in usable state.", - handle, dev->pfun->pathname); + "the device %" PRIun " is not in usable state.", handle); async_answer_0(iid, ENOENT); return; @@ -647,8 +637,7 @@ method = DRIVER_CLIENT; - if (driver->phone < 0) { - log_msg(LVL_ERROR, - "Could not forward to driver `%s' (phone is %d).", - driver->name, (int) driver->phone); + if (!driver->sess) { + log_msg(LVL_ERROR, + "Could not forward to driver `%s'.", driver->name); async_answer_0(iid, EINVAL); return; @@ -664,6 +653,8 @@ dev->pfun->pathname, driver->name); } - - async_forward_fast(iid, driver->phone, method, fwd_h, 0, IPC_FF_NONE); + + async_exch_t *exch = async_exchange_begin(driver->sess); + async_forward_fast(iid, exch, method, fwd_h, 0, IPC_FF_NONE); + async_exchange_end(exch); } @@ -687,12 +678,15 @@ dev = fun->dev; - if (dev->state != DEVICE_USABLE || dev->drv->phone < 0) { + if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) { async_answer_0(iid, EINVAL); return; } - async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0, + async_exch_t *exch = async_exchange_begin(dev->drv->sess); + async_forward_fast(iid, exch, DRIVER_CLIENT, fun->handle, 0, IPC_FF_NONE); - log_msg(LVL_DEBUG, + async_exchange_end(exch); + + log_msg(LVL_DEBUG, "Forwarding devmapper request for `%s' function to driver `%s'.", fun->pathname, dev->drv->name); @@ -786,4 +780,5 @@ printf(NAME ": Accepting connections.\n"); + task_retval(0); async_manager();