Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -317,12 +317,15 @@ (void) async_share_out_finalize(callid, fs_va); - while (1) { + while (true) { callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case BD_READ_BLOCKS: ba = MERGE_LOUP32(IPC_GET_ARG1(call), Index: uspace/srv/bd/file_bd/file_bd.c =================================================================== --- uspace/srv/bd/file_bd/file_bd.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/bd/file_bd/file_bd.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -198,12 +198,15 @@ (void) async_share_out_finalize(callid, fs_va); - while (1) { + while (true) { callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case BD_READ_BLOCKS: ba = MERGE_LOUP32(IPC_GET_ARG1(call), Index: uspace/srv/bd/gxe_bd/gxe_bd.c =================================================================== --- uspace/srv/bd/gxe_bd/gxe_bd.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/bd/gxe_bd/gxe_bd.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -201,12 +201,15 @@ (void) async_share_out_finalize(callid, fs_va); - while (1) { + while (true) { callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case BD_READ_BLOCKS: ba = MERGE_LOUP32(IPC_GET_ARG1(call), Index: uspace/srv/bd/part/guid_part/guid_part.c =================================================================== --- uspace/srv/bd/part/guid_part/guid_part.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/bd/part/guid_part/guid_part.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -139,5 +139,5 @@ } - rc = block_init(indev_handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048); if (rc != EOK) { printf(NAME ": could not init libblock.\n"); @@ -356,12 +356,15 @@ (void) async_share_out_finalize(callid, fs_va); - while (1) { + while (true) { callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case BD_READ_BLOCKS: ba = MERGE_LOUP32(IPC_GET_ARG1(call), Index: uspace/srv/bd/part/mbr_part/mbr_part.c =================================================================== --- uspace/srv/bd/part/mbr_part/mbr_part.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/bd/part/mbr_part/mbr_part.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -190,5 +190,5 @@ } - rc = block_init(indev_handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048); if (rc != EOK) { printf(NAME ": could not init libblock.\n"); @@ -437,9 +437,12 @@ callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case BD_READ_BLOCKS: ba = MERGE_LOUP32(IPC_GET_ARG1(call), Index: uspace/srv/bd/rd/rd.c =================================================================== --- uspace/srv/bd/rd/rd.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/bd/rd/rd.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -123,12 +123,15 @@ while (true) { callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + + if (!IPC_GET_IMETHOD(call)) { /* * The other side has hung up. - * Answer the message and exit the fibril. + * Exit the fibril. */ async_answer_0(callid, EOK); return; + } + + switch (IPC_GET_IMETHOD(call)) { case BD_READ_BLOCKS: ba = MERGE_LOUP32(IPC_GET_ARG1(call), @@ -243,5 +246,5 @@ return false; } - + fibril_rwlock_initialize(&rd_lock); @@ -258,5 +261,5 @@ printf("%s: Accepting connections\n", NAME); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/clip/clip.c =================================================================== --- uspace/srv/clip/clip.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/clip/clip.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -30,5 +30,5 @@ #include #include -#include +#include #include #include @@ -153,13 +153,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 CLIPBOARD_PUT_DATA: clip_put_data(callid, &call); @@ -179,5 +178,5 @@ int main(int argc, char *argv[]) { - printf(NAME ": HelenOS clipboard service\n"); + printf("%s: HelenOS clipboard service\n", NAME); async_set_client_connection(clip_connection); @@ -186,5 +185,6 @@ return -1; - printf(NAME ": Accepting connections\n"); + printf("%s: Accepting connections\n", NAME); + task_retval(0); async_manager(); Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/devman/devman.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -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 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/devman/devman.h (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -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 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/devman/main.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -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(); Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/devmap/devmap.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -37,5 +37,5 @@ #include -#include +#include #include #include @@ -59,10 +59,14 @@ /** Pointers to previous and next drivers in linked list */ link_t drivers; + /** Pointer to the linked list of devices controlled by this driver */ link_t devices; - /** Phone asociated with this driver */ - sysarg_t phone; + + /** Session asociated with this driver */ + async_sess_t *sess; + /** Device driver name */ char *name; + /** Fibril mutex for list of devices owned by this driver */ fibril_mutex_t devices_mutex; @@ -75,8 +79,11 @@ /** Pointer to the previous and next device in the list of all namespaces */ link_t namespaces; + /** Unique namespace identifier */ devmap_handle_t handle; + /** Namespace name */ char *name; + /** Reference count */ size_t refcnt; @@ -405,17 +412,11 @@ * Create connection to the driver */ - 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) { free(driver->name); free(driver); - async_answer_0(callid, ENOTSUP); async_answer_0(iid, ENOTSUP); return NULL; } - - driver->phone = IPC_GET_ARG5(call); - async_answer_0(callid, EOK); /* @@ -462,6 +463,6 @@ fibril_mutex_lock(&drivers_list_mutex); - if (driver->phone != 0) - async_hangup(driver->phone); + if (driver->sess) + async_hangup(driver->sess); /* Remove it from list of drivers */ @@ -607,5 +608,5 @@ devmap_device_t *dev = devmap_device_find_handle(handle); - if ((dev == NULL) || (dev->driver == NULL) || (dev->driver->phone == 0)) { + if ((dev == NULL) || (dev->driver == NULL) || (!dev->driver->sess)) { fibril_mutex_unlock(&devices_list_mutex); async_answer_0(callid, ENOENT); @@ -613,13 +614,13 @@ } - if (dev->forward_interface == 0) { - async_forward_fast(callid, dev->driver->phone, - dev->handle, 0, 0, - IPC_FF_NONE); - } else { - async_forward_fast(callid, dev->driver->phone, - dev->forward_interface, dev->handle, 0, - IPC_FF_NONE); - } + async_exch_t *exch = async_exchange_begin(dev->driver->sess); + + if (dev->forward_interface == 0) + async_forward_fast(callid, exch, dev->handle, 0, 0, IPC_FF_NONE); + else + async_forward_fast(callid, exch, dev->forward_interface, + dev->handle, 0, IPC_FF_NONE); + + async_exchange_end(exch); fibril_mutex_unlock(&devices_list_mutex); @@ -1029,13 +1030,12 @@ return; - 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 DEVMAP_DRIVER_UNREGISTER: if (NULL == driver) @@ -1080,13 +1080,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 DEVMAP_DEVICE_GET_HANDLE: devmap_device_get_handle(callid, &call); Index: uspace/srv/fs/devfs/devfs.c =================================================================== --- uspace/srv/fs/devfs/devfs.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/devfs/devfs.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -41,5 +41,5 @@ #include #include -#include +#include #include #include @@ -68,7 +68,8 @@ ipc_callid_t callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + if (!IPC_GET_IMETHOD(call)) return; + + switch (IPC_GET_IMETHOD(call)) { case VFS_OUT_MOUNTED: devfs_mounted(callid, &call); @@ -119,25 +120,26 @@ int main(int argc, char *argv[]) { - printf(NAME ": HelenOS Device Filesystem\n"); + printf("%s: HelenOS Device Filesystem\n", NAME); if (!devfs_init()) { - printf(NAME ": failed to initialize devfs\n"); + printf("%s: failed to initialize devfs\n", NAME); return -1; } - int vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0); - if (vfs_phone < EOK) { - printf(NAME ": Unable to connect to VFS\n"); + async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_VFS, 0, 0); + if (!vfs_sess) { + printf("%s: Unable to connect to VFS\n", NAME); return -1; } - int rc = fs_register(vfs_phone, &devfs_reg, &devfs_vfs_info, + int rc = fs_register(vfs_sess, &devfs_reg, &devfs_vfs_info, devfs_connection); if (rc != EOK) { - printf(NAME ": Failed to register file system (%d)\n", rc); + printf("%s: Failed to register file system (%d)\n", NAME, rc); return rc; } - printf(NAME ": Accepting connections\n"); + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); Index: uspace/srv/fs/devfs/devfs_ops.c =================================================================== --- uspace/srv/fs/devfs/devfs_ops.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/devfs/devfs_ops.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -59,8 +59,8 @@ typedef struct { devmap_handle_t handle; - int phone; /**< When < 0, the structure is incomplete. */ + async_sess_t *sess; /**< If NULL, the structure is incomplete. */ size_t refcount; link_t link; - fibril_condvar_t cv; /**< Broadcast when completed. */ + fibril_condvar_t cv; /**< Broadcast when completed. */ } device_t; @@ -232,5 +232,5 @@ }; link_t *lnk; - + fibril_mutex_lock(&devices_mutex); restart: @@ -244,8 +244,10 @@ dev->handle = node->handle; - dev->phone = -1; /* mark as incomplete */ + + /* Mark as incomplete */ + dev->sess = NULL; dev->refcount = 1; fibril_condvar_initialize(&dev->cv); - + /* * Insert the incomplete device structure so that other @@ -254,14 +256,15 @@ */ hash_table_insert(&devices, key, &dev->link); - + /* * Drop the mutex to allow recursive devfs requests. */ fibril_mutex_unlock(&devices_mutex); - - int phone = devmap_device_connect(node->handle, 0); - + + async_sess_t *sess = devmap_device_connect(EXCHANGE_SERIALIZE, + node->handle, 0); + fibril_mutex_lock(&devices_mutex); - + /* * Notify possible waiters about this device structure @@ -269,6 +272,6 @@ */ fibril_condvar_broadcast(&dev->cv); - - if (phone < 0) { + + if (!sess) { /* * Connecting failed, need to remove the @@ -277,14 +280,14 @@ hash_table_remove(&devices, key, DEVICES_KEYS); fibril_mutex_unlock(&devices_mutex); - + return ENOENT; } - /* Set the correct phone. */ - dev->phone = phone; + /* Set the correct session. */ + dev->sess = sess; } else { device_t *dev = hash_table_get_instance(lnk, device_t, link); - - if (dev->phone < 0) { + + if (!dev->sess) { /* * Wait until the device structure is completed @@ -608,5 +611,5 @@ device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->phone >= 0); + assert(dev->sess); ipc_callid_t callid; @@ -619,11 +622,16 @@ /* Make a request at the driver */ + async_exch_t *exch = async_exchange_begin(dev->sess); + ipc_call_t answer; - aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request), + aid_t msg = async_send_3(exch, IPC_GET_IMETHOD(*request), IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), IPC_GET_ARG3(*request), &answer); /* Forward the IPC_M_DATA_READ request to the driver */ - async_forward_fast(callid, dev->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + + async_exchange_end(exch); + fibril_mutex_unlock(&devices_mutex); @@ -672,5 +680,5 @@ device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->phone >= 0); + assert(dev->sess); ipc_callid_t callid; @@ -683,11 +691,15 @@ /* Make a request at the driver */ + async_exch_t *exch = async_exchange_begin(dev->sess); + ipc_call_t answer; - aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request), + aid_t msg = async_send_3(exch, IPC_GET_IMETHOD(*request), IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), IPC_GET_ARG3(*request), &answer); /* Forward the IPC_M_DATA_WRITE request to the driver */ - async_forward_fast(callid, dev->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + + async_exchange_end(exch); fibril_mutex_unlock(&devices_mutex); @@ -742,9 +754,9 @@ device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->phone >= 0); + assert(dev->sess); dev->refcount--; if (dev->refcount == 0) { - async_hangup(dev->phone); + async_hangup(dev->sess); hash_table_remove(&devices, key, DEVICES_KEYS); } @@ -790,10 +802,14 @@ device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->phone >= 0); + assert(dev->sess); /* Make a request at the driver */ + async_exch_t *exch = async_exchange_begin(dev->sess); + ipc_call_t answer; - aid_t msg = async_send_2(dev->phone, IPC_GET_IMETHOD(*request), + aid_t msg = async_send_2(exch, IPC_GET_IMETHOD(*request), IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), &answer); + + async_exchange_end(exch); fibril_mutex_unlock(&devices_mutex); Index: uspace/srv/fs/ext2fs/ext2fs.c =================================================================== --- uspace/srv/fs/ext2fs/ext2fs.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/ext2fs/ext2fs.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -40,5 +40,5 @@ #include "ext2fs.h" #include -#include +#include #include #include @@ -87,12 +87,12 @@ dprintf(NAME ": connection opened\n"); - while (1) { - ipc_callid_t callid; + while (true) { ipc_call_t call; - - callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) return; + + switch (IPC_GET_IMETHOD(call)) { case VFS_OUT_MOUNTED: ext2fs_mounted(callid, &call); @@ -143,16 +143,14 @@ int main(int argc, char **argv) { - int vfs_phone; - int rc; - printf(NAME ": HelenOS EXT2 file system server\n"); - - vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0); - if (vfs_phone < EOK) { + + async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_VFS, 0, 0); + if (!vfs_sess) { printf(NAME ": failed to connect to VFS\n"); return -1; } - rc = ext2fs_global_init(); + int rc = ext2fs_global_init(); if (rc != EOK) { printf(NAME ": Failed global initialization\n"); @@ -160,5 +158,5 @@ } - rc = fs_register(vfs_phone, &ext2fs_reg, &ext2fs_vfs_info, ext2fs_connection); + rc = fs_register(vfs_sess, &ext2fs_reg, &ext2fs_vfs_info, ext2fs_connection); if (rc != EOK) { fprintf(stdout, NAME ": Failed to register fs (%d)\n", rc); Index: uspace/srv/fs/fat/fat.c =================================================================== --- uspace/srv/fs/fat/fat.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/fat/fat.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -39,5 +39,5 @@ #include "fat.h" #include -#include +#include #include #include @@ -88,12 +88,13 @@ dprintf(NAME ": connection opened\n"); - while (1) { - ipc_callid_t callid; + + while (true) { ipc_call_t call; - - callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) return; + + switch (IPC_GET_IMETHOD(call)) { case VFS_OUT_MOUNTED: fat_mounted(callid, &call); @@ -144,20 +145,18 @@ int main(int argc, char **argv) { - int vfs_phone; - int rc; - printf(NAME ": HelenOS FAT file system server\n"); - - rc = fat_idx_init(); + + int rc = fat_idx_init(); if (rc != EOK) goto err; - - vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0); - if (vfs_phone < EOK) { + + async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_VFS, 0, 0); + if (!vfs_sess) { printf(NAME ": failed to connect to VFS\n"); return -1; } - rc = fs_register(vfs_phone, &fat_reg, &fat_vfs_info, fat_connection); + rc = fs_register(vfs_sess, &fat_reg, &fat_vfs_info, fat_connection); if (rc != EOK) { fat_idx_fini(); @@ -168,7 +167,8 @@ task_retval(0); async_manager(); - /* not reached */ + + /* Not reached */ return 0; - + err: printf(NAME ": Failed to register file system (%d)\n", rc); @@ -178,3 +178,3 @@ /** * @} - */ + */ Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/fat/fat_ops.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -970,5 +970,5 @@ /* initialize libblock */ - rc = block_init(devmap_handle, BS_SIZE); + rc = block_init(EXCHANGE_SERIALIZE, devmap_handle, BS_SIZE); if (rc != EOK) { async_answer_0(rid, rc); Index: uspace/srv/fs/tmpfs/tmpfs.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/tmpfs/tmpfs.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -30,5 +30,5 @@ /** @addtogroup fs * @{ - */ + */ /** @@ -43,5 +43,5 @@ #include "tmpfs.h" #include -#include +#include #include #include @@ -94,12 +94,13 @@ dprintf(NAME ": connection opened\n"); - while (1) { - ipc_callid_t callid; + + while (true) { ipc_call_t call; - - callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) return; + + switch (IPC_GET_IMETHOD(call)) { case VFS_OUT_MOUNTED: tmpfs_mounted(callid, &call); @@ -151,17 +152,18 @@ { printf(NAME ": HelenOS TMPFS file system server\n"); - + if (!tmpfs_init()) { printf(NAME ": failed to initialize TMPFS\n"); return -1; } - - int vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0); - if (vfs_phone < EOK) { + + async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_VFS, 0, 0); + if (!vfs_sess) { printf(NAME ": Unable to connect to VFS\n"); return -1; } - - int rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info, + + int rc = fs_register(vfs_sess, &tmpfs_reg, &tmpfs_vfs_info, tmpfs_connection); if (rc != EOK) { @@ -169,9 +171,10 @@ return rc; } - + printf(NAME ": Accepting connections\n"); task_retval(0); async_manager(); - /* not reached */ + + /* Not reached */ return 0; } @@ -179,3 +182,3 @@ /** * @} - */ + */ Index: uspace/srv/fs/tmpfs/tmpfs_dump.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_dump.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/fs/tmpfs/tmpfs_dump.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -167,5 +167,5 @@ int rc; - rc = block_init(dev, TMPFS_COMM_SIZE); + rc = block_init(EXCHANGE_SERIALIZE, dev, TMPFS_COMM_SIZE); if (rc != EOK) return false; Index: uspace/srv/hid/adb_mouse/adb_dev.c =================================================================== --- uspace/srv/hid/adb_mouse/adb_dev.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/adb_mouse/adb_dev.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -39,4 +39,9 @@ #include #include +#include +#include +#include +#include +#include #include "adb_mouse.h" @@ -45,27 +50,23 @@ static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall); -static int dev_phone; - int adb_dev_init(void) { - const char *input = "/dev/adb/mouse"; - int input_fd; - - printf(NAME ": open %s\n", input); - - input_fd = open(input, O_RDONLY); - if (input_fd < 0) { - printf(NAME ": Failed opening %s (%d)\n", input, input_fd); - return false; + devmap_handle_t handle; + int rc = devmap_device_get_handle("adb/mouse", &handle, + IPC_FLAG_BLOCKING); + + if (rc != EOK) { + printf("%s: Failed resolving ADB\n", NAME); + return rc; } - - dev_phone = fd_phone(input_fd); + + int dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING); if (dev_phone < 0) { - printf(NAME ": Failed to connect to device\n"); - return false; + printf("%s: Failed connecting to ADB\n", NAME); + return ENOENT; } - + /* NB: The callback connection is slotted for removal */ - if (async_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) { + if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) { printf(NAME ": Failed to create callback from device\n"); return false; @@ -84,9 +85,11 @@ int retval; + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - /* TODO: Handle hangup */ - return; case IPC_FIRST_USER_METHOD: mouse_handle_data(IPC_GET_ARG1(call)); Index: uspace/srv/hid/adb_mouse/adb_mouse.c =================================================================== --- uspace/srv/hid/adb_mouse/adb_mouse.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/adb_mouse/adb_mouse.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -43,9 +43,12 @@ #include #include +#include #include #include - #include "adb_mouse.h" #include "adb_dev.h" + +// FIXME: remove this header +#include static void client_connection(ipc_callid_t iid, ipc_call_t *icall); @@ -101,8 +104,8 @@ while (1) { callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + + if (!IPC_GET_IMETHOD(call)) { if (client_phone != -1) { - async_hangup(client_phone); + async_obsolete_hangup(client_phone); client_phone = -1; } @@ -110,4 +113,7 @@ async_answer_0(callid, EOK); return; + } + + switch (IPC_GET_IMETHOD(call)) { case IPC_M_CONNECT_TO_ME: if (client_phone != -1) { @@ -158,5 +164,5 @@ { if (client_phone != -1) { - async_msg_2(client_phone, MEVENT_BUTTON, button, press); + async_obsolete_msg_2(client_phone, MEVENT_BUTTON, button, press); } } @@ -165,5 +171,5 @@ { if (client_phone != -1) - async_msg_2(client_phone, MEVENT_MOVE, dx, dy); + async_obsolete_msg_2(client_phone, MEVENT_MOVE, dx, dy); } Index: uspace/srv/hid/char_mouse/char_mouse.c =================================================================== --- uspace/srv/hid/char_mouse/char_mouse.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/char_mouse/char_mouse.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -43,10 +43,13 @@ #include #include +#include #include #include - #include #include #include + +// FIXME: remove this header +#include #define NAME "mouse" @@ -65,5 +68,5 @@ /* printf("ev_btn: button %d, press %d\n", button, press);*/ if (client_phone != -1) { - async_msg_2(client_phone, MEVENT_BUTTON, button, press); + async_obsolete_msg_2(client_phone, MEVENT_BUTTON, button, press); } } @@ -73,5 +76,5 @@ /* printf("ev_move: dx %d, dy %d\n", dx, dy);*/ if (client_phone != -1) - async_msg_2(client_phone, MEVENT_MOVE, dx, dy); + async_obsolete_msg_2(client_phone, MEVENT_MOVE, dx, dy); } @@ -86,8 +89,8 @@ while (1) { callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + + if (!IPC_GET_IMETHOD(call)) { if (client_phone != -1) { - async_hangup(client_phone); + async_obsolete_hangup(client_phone); client_phone = -1; } @@ -95,4 +98,7 @@ async_answer_0(callid, EOK); return; + } + + switch (IPC_GET_IMETHOD(call)) { case IPC_M_CONNECT_TO_ME: if (client_phone != -1) { Index: uspace/srv/hid/char_mouse/chardev.c =================================================================== --- uspace/srv/hid/char_mouse/chardev.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/char_mouse/chardev.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -36,8 +36,10 @@ #include #include +#include #include #include #include - +#include +#include #include #include @@ -51,27 +53,25 @@ int mouse_port_init(void) { - const char *input = "/dev/char/ps2b"; - int input_fd; - - printf(NAME ": open %s\n", input); - - input_fd = open(input, O_RDONLY); - if (input_fd < 0) { - printf(NAME ": Failed opening %s (%d)\n", input, input_fd); - return false; + devmap_handle_t handle; + int rc = devmap_device_get_handle("char/ps2b", &handle, + IPC_FLAG_BLOCKING); + + if (rc != EOK) { + printf("%s: Failed resolving PS/2\n", NAME); + return rc; } - - dev_phone = fd_phone(input_fd); + + dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING); if (dev_phone < 0) { - printf(NAME ": Failed to connect to device\n"); - return false; + printf("%s: Failed connecting to PS/2\n", NAME); + return ENOENT; } - + /* NB: The callback connection is slotted for removal */ - if (async_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) { + if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) { printf(NAME ": Failed to create callback from device\n"); return false; } - + return 0; } @@ -87,5 +87,5 @@ void mouse_port_write(uint8_t data) { - async_msg_1(dev_phone, CHAR_WRITE_BYTE, data); + async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data); } @@ -99,9 +99,11 @@ int retval; + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - /* TODO: Handle hangup */ - return; case IPC_FIRST_USER_METHOD: mouse_handle_byte(IPC_GET_ARG1(call)); Index: uspace/srv/hid/console/console.c =================================================================== --- uspace/srv/hid/console/console.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/console/console.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -39,5 +39,6 @@ #include #include -#include +#include +#include #include #include @@ -45,4 +46,5 @@ #include #include +#include #include #include @@ -52,4 +54,5 @@ #include #include +#include #include #include @@ -63,7 +66,10 @@ #include "keybuffer.h" +// FIXME: remove this header +#include #define NAME "console" #define NAMESPACE "term" + /** Interval for checking for new keyboard (1/4s). */ #define HOTPLUG_WATCH_INTERVAL (1000 * 250) @@ -71,4 +77,5 @@ /* Kernel defines 32 but does not export it. */ #define MAX_IPC_OUTGOING_PHONES 128 + /** To allow proper phone closing. */ static ipc_callid_t driver_phones[MAX_IPC_OUTGOING_PHONES] = { 0 }; @@ -97,6 +104,4 @@ } console_t; - - /** Array of data for virtual consoles */ static console_t consoles[CONSOLE_COUNT]; @@ -122,55 +127,55 @@ static void curs_visibility(bool visible) { - async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, visible); + async_obsolete_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, visible); } static void curs_hide_sync(void) { - async_req_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false); + async_obsolete_req_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false); } static void curs_goto(sysarg_t x, sysarg_t y) { - async_msg_2(fb_info.phone, FB_CURSOR_GOTO, x, y); + async_obsolete_msg_2(fb_info.phone, FB_CURSOR_GOTO, x, y); } static void screen_clear(void) { - async_msg_0(fb_info.phone, FB_CLEAR); + async_obsolete_msg_0(fb_info.phone, FB_CLEAR); } static void screen_yield(void) { - async_req_0_0(fb_info.phone, FB_SCREEN_YIELD); + async_obsolete_req_0_0(fb_info.phone, FB_SCREEN_YIELD); } static void screen_reclaim(void) { - async_req_0_0(fb_info.phone, FB_SCREEN_RECLAIM); + async_obsolete_req_0_0(fb_info.phone, FB_SCREEN_RECLAIM); } static void kbd_yield(void) { - async_req_0_0(kbd_phone, KBD_YIELD); + async_obsolete_req_0_0(kbd_phone, KBD_YIELD); } static void kbd_reclaim(void) { - async_req_0_0(kbd_phone, KBD_RECLAIM); + async_obsolete_req_0_0(kbd_phone, KBD_RECLAIM); } static void set_style(uint8_t style) { - async_msg_1(fb_info.phone, FB_SET_STYLE, style); + async_obsolete_msg_1(fb_info.phone, FB_SET_STYLE, style); } static void set_color(uint8_t fgcolor, uint8_t bgcolor, uint8_t flags) { - async_msg_3(fb_info.phone, FB_SET_COLOR, fgcolor, bgcolor, flags); + async_obsolete_msg_3(fb_info.phone, FB_SET_COLOR, fgcolor, bgcolor, flags); } static void set_rgb_color(uint32_t fgcolor, uint32_t bgcolor) { - async_msg_2(fb_info.phone, FB_SET_RGB_COLOR, fgcolor, bgcolor); + async_obsolete_msg_2(fb_info.phone, FB_SET_RGB_COLOR, fgcolor, bgcolor); } @@ -227,5 +232,5 @@ } - async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA, + async_obsolete_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA, x0, y0, width, height); } @@ -268,5 +273,5 @@ static void fb_putchar(wchar_t c, sysarg_t col, sysarg_t row) { - async_msg_3(fb_info.phone, FB_PUTCHAR, c, col, row); + async_obsolete_msg_3(fb_info.phone, FB_PUTCHAR, c, col, row); } @@ -317,5 +322,5 @@ if (cons == active_console) - async_msg_1(fb_info.phone, FB_SCROLL, 1); + async_obsolete_msg_1(fb_info.phone, FB_SCROLL, 1); } @@ -328,17 +333,16 @@ static void change_console(console_t *cons) { - if (cons == active_console) { + if (cons == active_console) return; - } fb_pending_flush(); if (cons == kernel_console) { - async_serialize_start(); + async_obsolete_serialize_start(); curs_hide_sync(); gcons_in_kernel(); screen_yield(); kbd_yield(); - async_serialize_end(); + async_obsolete_serialize_end(); if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) { @@ -350,5 +354,5 @@ if (cons != kernel_console) { - async_serialize_start(); + async_obsolete_serialize_start(); if (active_console == kernel_console) { @@ -377,5 +381,5 @@ /* This call can preempt, but we are already at the end */ - rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA, + rc = async_obsolete_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, cons->scr.size_x, cons->scr.size_y); @@ -405,5 +409,5 @@ curs_visibility(cons->scr.is_cursor_visible); - async_serialize_end(); + async_obsolete_serialize_end(); } } @@ -416,5 +420,5 @@ printf("Device %" PRIxn " gone.\n", hash); driver_phones[i] = 0; - async_hangup(i); + async_obsolete_hangup(i); return; } @@ -431,11 +435,13 @@ int retval; - console_event_t ev; - - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + kbd_event_t ev; + + if (!IPC_GET_IMETHOD(call)) { /* TODO: Handle hangup */ close_driver_phone(iid); return; + } + + switch (IPC_GET_IMETHOD(call)) { case KBD_EVENT: /* Got event from keyboard driver. */ @@ -477,15 +483,16 @@ int retval; - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + if (!IPC_GET_IMETHOD(call)) { /* TODO: Handle hangup */ close_driver_phone(iid); return; + } + + switch (IPC_GET_IMETHOD(call)) { case MEVENT_BUTTON: if (IPC_GET_ARG1(call) == 1) { int newcon = gcons_mouse_btn((bool) IPC_GET_ARG2(call)); - if (newcon != -1) { + if (newcon != -1) change_console(&consoles[newcon]); - } } retval = 0; @@ -515,5 +522,5 @@ } - async_serialize_start(); + async_obsolete_serialize_start(); size_t off = 0; @@ -523,5 +530,5 @@ } - async_serialize_end(); + async_obsolete_serialize_end(); gcons_notify_char(cons->index); @@ -549,5 +556,5 @@ size_t pos = 0; - console_event_t ev; + kbd_event_t ev; fibril_mutex_lock(&input_mutex); @@ -574,5 +581,5 @@ static void cons_get_event(console_t *cons, ipc_callid_t rid, ipc_call_t *request) { - console_event_t ev; + kbd_event_t ev; fibril_mutex_lock(&input_mutex); @@ -618,5 +625,5 @@ int rc; - async_serialize_start(); + async_obsolete_serialize_start(); if (cons->refcount == 0) gcons_notify_connect(cons->index); @@ -628,7 +635,7 @@ while (true) { - async_serialize_end(); + async_obsolete_serialize_end(); callid = async_get_call(&call); - async_serialize_start(); + async_obsolete_serialize_start(); arg1 = 0; @@ -636,24 +643,26 @@ arg3 = 0; - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + if (!IPC_GET_IMETHOD(call)) { cons->refcount--; if (cons->refcount == 0) gcons_notify_disconnect(cons->index); return; + } + + switch (IPC_GET_IMETHOD(call)) { case VFS_OUT_READ: - async_serialize_end(); + async_obsolete_serialize_end(); cons_read(cons, callid, &call); - async_serialize_start(); + async_obsolete_serialize_start(); continue; case VFS_OUT_WRITE: - async_serialize_end(); + async_obsolete_serialize_end(); cons_write(cons, callid, &call); - async_serialize_start(); + async_obsolete_serialize_start(); continue; case VFS_OUT_SYNC: fb_pending_flush(); if (cons == active_console) { - async_req_0_0(fb_info.phone, FB_FLUSH); + async_obsolete_req_0_0(fb_info.phone, FB_FLUSH); curs_goto(cons->scr.position_x, cons->scr.position_y); } @@ -662,5 +671,5 @@ /* Send message to fb */ if (cons == active_console) - async_msg_0(fb_info.phone, FB_CLEAR); + async_obsolete_msg_0(fb_info.phone, FB_CLEAR); screenbuffer_clear(&cons->scr); @@ -721,7 +730,7 @@ break; case CONSOLE_GET_EVENT: - async_serialize_end(); + async_obsolete_serialize_end(); cons_get_event(cons, callid, &call); - async_serialize_start(); + async_obsolete_serialize_start(); continue; case CONSOLE_KCON_ENABLE: @@ -739,65 +748,63 @@ static int async_connect_to_me_hack(int phone, sysarg_t arg1, sysarg_t arg2, -sysarg_t arg3, async_client_conn_t client_receiver, ipc_callid_t *hash) + sysarg_t arg3, async_client_conn_t client_receiver, ipc_callid_t *hash) { sysarg_t task_hash; sysarg_t phone_hash; - int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3, + int rc = async_obsolete_req_3_5(phone, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3, NULL, NULL, NULL, &task_hash, &phone_hash); if (rc != EOK) return rc; - + if (client_receiver != NULL) async_new_connection(task_hash, phone_hash, phone_hash, NULL, client_receiver); - - if (hash != NULL) { + + if (hash != NULL) *hash = phone_hash; - } - + return EOK; } static int connect_keyboard_or_mouse(const char *devname, - async_client_conn_t handler, const char *path) -{ - int fd = open(path, O_RDONLY); - if (fd < 0) { - return fd; - } - - int phone = fd_phone(fd); - close(fd); - if (phone < 0) { - printf(NAME ": Failed to connect to input device\n"); - return phone; - } - + async_client_conn_t handler, const char *dev) +{ + int phone; + devmap_handle_t handle; + + int rc = devmap_device_get_handle(dev, &handle, 0); + if (rc == EOK) { + phone = devmap_obsolete_device_connect(handle, 0); + if (phone < 0) { + printf("%s: Failed to connect to input device\n", NAME); + return phone; + } + } else + return rc; + + /* NB: The callback connection is slotted for removal */ ipc_callid_t hash; - int rc = async_connect_to_me_hack(phone, SERVICE_CONSOLE, 0, phone, + rc = async_connect_to_me_hack(phone, SERVICE_CONSOLE, 0, phone, handler, &hash); if (rc != EOK) { - async_hangup(phone); - printf(NAME ": " \ - "Failed to create callback from input device: %s.\n", - str_error(rc)); + async_obsolete_hangup(phone); + printf("%s: Failed to create callback from input device (%s).\n", + NAME, str_error(rc)); return rc; } driver_phones[phone] = hash; - - printf(NAME ": found %s \"%s\" (%" PRIxn ").\n", devname, path, hash); - + printf("%s: found %s \"%s\" (%" PRIxn ").\n", NAME, devname, dev, hash); return phone; } -static int connect_keyboard(const char *path) -{ - return connect_keyboard_or_mouse("keyboard", keyboard_events, path); -} - -static int connect_mouse(const char *path) -{ - return connect_keyboard_or_mouse("mouse", mouse_events, path); +static int connect_keyboard(const char *dev) +{ + return connect_keyboard_or_mouse("keyboard", keyboard_events, dev); +} + +static int connect_mouse(const char *dev) +{ + return connect_keyboard_or_mouse("mouse", mouse_events, dev); } @@ -810,33 +817,34 @@ * * @param arg Class name. + * * @return This function should never exit. + * */ static int check_new_device_fibril(void *arg) { - struct hid_class_info *dev_info = arg; - + struct hid_class_info *dev_info = (struct hid_class_info *) arg; + size_t index = 1; - + while (true) { async_usleep(HOTPLUG_WATCH_INTERVAL); - char *path; - int rc = asprintf(&path, "/dev/class/%s\\%zu", + + char *dev; + int rc = asprintf(&dev, "class/%s\\%zu", dev_info->classname, index); - if (rc < 0) { + if (rc < 0) continue; - } - rc = 0; - rc = dev_info->connection_func(path); + + rc = dev_info->connection_func(dev); if (rc > 0) { /* We do not allow unplug. */ index++; } - - free(path); - } - + + free(dev); + } + return EOK; } - /** Start a fibril monitoring hot-plugged keyboards. @@ -847,47 +855,45 @@ struct hid_class_info *dev_info = malloc(sizeof(struct hid_class_info)); if (dev_info == NULL) { - printf(NAME ": " \ - "out of memory, will not start hot-plug-watch fibril.\n"); + printf("%s: Out of memory, no hot-plug support.\n", NAME); return; } - int rc; - - rc = asprintf(&dev_info->classname, "%s", classname); + + int rc = asprintf(&dev_info->classname, "%s", classname); if (rc < 0) { - printf(NAME ": failed to format classname: %s.\n", + printf("%s: Failed to format classname: %s.\n", NAME, str_error(rc)); return; } + dev_info->connection_func = connection_func; - - fid_t fid = fibril_create(check_new_device_fibril, (void *)dev_info); + + fid_t fid = fibril_create(check_new_device_fibril, (void *) dev_info); if (!fid) { - printf(NAME - ": failed to create hot-plug-watch fibril for %s.\n", + printf("%s: Failed to create hot-plug fibril for %s.\n", NAME, classname); return; } + fibril_add_ready(fid); } -static bool console_init(char *input) +static bool console_srv_init(char *kdev) { /* Connect to input device */ - kbd_phone = connect_keyboard(input); - if (kbd_phone < 0) { + kbd_phone = connect_keyboard(kdev); + if (kbd_phone < 0) return false; - } - - mouse_phone = connect_mouse("/dev/hid_in/mouse"); + + mouse_phone = connect_mouse("hid_in/mouse"); if (mouse_phone < 0) { - printf(NAME ": Failed to connect to mouse device: %s.\n", + printf("%s: Failed to connect to mouse device %s\n", NAME, str_error(mouse_phone)); } /* Connect to framebuffer driver */ - fb_info.phone = service_connect_blocking(SERVICE_VIDEO, 0, 0); + fb_info.phone = service_obsolete_connect_blocking(SERVICE_VIDEO, 0, 0); if (fb_info.phone < 0) { - printf(NAME ": Failed to connect to video service\n"); - return -1; + printf("%s: Failed to connect to video service\n", NAME); + return false; } @@ -895,5 +901,5 @@ int rc = devmap_driver_register(NAME, client_connection); if (rc < 0) { - printf(NAME ": Unable to register driver (%d)\n", rc); + printf("%s: Unable to register driver (%d)\n", NAME, rc); return false; } @@ -903,7 +909,7 @@ /* Synchronize, the gcons could put something in queue */ - async_req_0_0(fb_info.phone, FB_FLUSH); - async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.cols, &fb_info.rows); - async_req_0_1(fb_info.phone, FB_GET_COLOR_CAP, &fb_info.color_cap); + async_obsolete_req_0_0(fb_info.phone, FB_FLUSH); + async_obsolete_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.cols, &fb_info.rows); + async_obsolete_req_0_1(fb_info.phone, FB_GET_COLOR_CAP, &fb_info.color_cap); /* Set up shared memory buffer. */ @@ -916,5 +922,5 @@ if (interbuffer) { - if (async_share_out_start(fb_info.phone, interbuffer, + if (async_obsolete_share_out_start(fb_info.phone, interbuffer, AS_AREA_READ) != EOK) { as_area_destroy(interbuffer); @@ -931,5 +937,5 @@ if (screenbuffer_init(&consoles[i].scr, fb_info.cols, fb_info.rows) == NULL) { - printf(NAME ": Unable to allocate screen buffer %zu\n", i); + printf("%s: Unable to allocate screen buffer %zu\n", NAME, i); return false; } @@ -943,5 +949,5 @@ if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) { - printf(NAME ": Unable to register device %s\n", vc); + printf("%s: Unable to register device %s\n", NAME, vc); return false; } @@ -953,5 +959,5 @@ /* Initialize the screen */ - async_serialize_start(); + async_obsolete_serialize_start(); gcons_redraw_console(); set_style(STYLE_NORMAL); @@ -959,15 +965,15 @@ curs_goto(0, 0); curs_visibility(active_console->scr.is_cursor_visible); - async_serialize_end(); + async_obsolete_serialize_end(); /* Receive kernel notifications */ async_set_interrupt_received(interrupt_received); if (event_subscribe(EVENT_KCONSOLE, 0) != EOK) - printf(NAME ": Error registering kconsole notifications\n"); + printf("%s: Error registering kconsole notifications\n", NAME); /* Start fibril for checking on hot-plugged keyboards. */ check_new_devices_in_background(connect_keyboard, "keyboard"); check_new_devices_in_background(connect_mouse, "mouse"); - + return true; } @@ -987,7 +993,7 @@ printf(NAME ": HelenOS Console service\n"); - if (!console_init(argv[1])) + if (!console_srv_init(argv[1])) return -1; - + printf(NAME ": Accepting connections\n"); async_manager(); Index: uspace/srv/hid/console/gcons.c =================================================================== --- uspace/srv/hid/console/gcons.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/console/gcons.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -35,4 +35,5 @@ #include #include +#include #include #include @@ -115,5 +116,5 @@ static void vp_switch(int vp) { - async_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp); + async_obsolete_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp); } @@ -121,5 +122,5 @@ static int vp_create(sysarg_t x, sysarg_t y, sysarg_t width, sysarg_t height) { - return async_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y, + return async_obsolete_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y, (width << 16) | height); } @@ -127,10 +128,10 @@ static void clear(void) { - async_msg_0(fbphone, FB_CLEAR); + async_obsolete_msg_0(fbphone, FB_CLEAR); } static void set_rgb_color(uint32_t fgcolor, uint32_t bgcolor) { - async_msg_2(fbphone, FB_SET_RGB_COLOR, fgcolor, bgcolor); + async_obsolete_msg_2(fbphone, FB_SET_RGB_COLOR, fgcolor, bgcolor); } @@ -138,5 +139,5 @@ static void tran_putch(wchar_t ch, sysarg_t col, sysarg_t row) { - async_msg_3(fbphone, FB_PUTCHAR, ch, col, row); + async_obsolete_msg_3(fbphone, FB_PUTCHAR, ch, col, row); } @@ -149,5 +150,5 @@ if (ic_pixmaps[state] != -1) - async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index], + async_obsolete_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index], ic_pixmaps[state]); @@ -177,5 +178,5 @@ if (animation != -1) - async_msg_1(fbphone, FB_ANIM_START, animation); + async_obsolete_msg_1(fbphone, FB_ANIM_START, animation); } else { if (console_state[active_console] == CONS_DISCONNECTED_SEL) @@ -258,5 +259,5 @@ { if (animation != -1) - async_msg_1(fbphone, FB_ANIM_STOP, animation); + async_obsolete_msg_1(fbphone, FB_ANIM_STOP, animation); active_console = KERNEL_CONSOLE; @@ -294,5 +295,5 @@ if (active_console != KERNEL_CONSOLE) - async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y); + async_obsolete_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y); } @@ -374,18 +375,18 @@ /* Send area */ - int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm); + int rc = async_obsolete_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm); if (rc) goto exit; - rc = async_share_out_start(fbphone, shm, PROTO_READ); + rc = async_obsolete_share_out_start(fbphone, shm, PROTO_READ); if (rc) goto drop; /* Draw logo */ - async_msg_2(fbphone, FB_DRAW_PPM, x, y); + async_obsolete_msg_2(fbphone, FB_DRAW_PPM, x, y); drop: /* Drop area */ - async_msg_0(fbphone, FB_DROP_SHM); + async_obsolete_msg_0(fbphone, FB_DROP_SHM); exit: @@ -436,14 +437,14 @@ /* Send area */ - int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm); + int rc = async_obsolete_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm); if (rc) goto exit; - rc = async_share_out_start(fbphone, shm, PROTO_READ); + rc = async_obsolete_share_out_start(fbphone, shm, PROTO_READ); if (rc) goto drop; /* Obtain pixmap */ - rc = async_req_0_0(fbphone, FB_SHM2PIXMAP); + rc = async_obsolete_req_0_0(fbphone, FB_SHM2PIXMAP); if (rc < 0) goto drop; @@ -453,5 +454,5 @@ drop: /* Drop area */ - async_msg_0(fbphone, FB_DROP_SHM); + async_obsolete_msg_0(fbphone, FB_DROP_SHM); exit: @@ -464,5 +465,5 @@ static void make_anim(void) { - int an = async_req_1_0(fbphone, FB_ANIM_CREATE, + int an = async_obsolete_req_1_0(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE]); if (an < 0) @@ -471,19 +472,19 @@ int pm = make_pixmap(_binary_gfx_anim_1_ppm_start, (size_t) &_binary_gfx_anim_1_ppm_size); - async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); pm = make_pixmap(_binary_gfx_anim_2_ppm_start, (size_t) &_binary_gfx_anim_2_ppm_size); - async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); pm = make_pixmap(_binary_gfx_anim_3_ppm_start, (size_t) &_binary_gfx_anim_3_ppm_size); - async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); pm = make_pixmap(_binary_gfx_anim_4_ppm_start, (size_t) &_binary_gfx_anim_4_ppm_size); - async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - - async_msg_1(fbphone, FB_ANIM_START, an); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); + + async_obsolete_msg_1(fbphone, FB_ANIM_START, an); animation = an; @@ -495,5 +496,5 @@ fbphone = phone; - int rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres); + int rc = async_obsolete_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres); if (rc) return; Index: uspace/srv/hid/console/keybuffer.c =================================================================== --- uspace/srv/hid/console/keybuffer.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/console/keybuffer.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -90,5 +90,5 @@ * */ -void keybuffer_push(keybuffer_t *keybuffer, const console_event_t *ev) +void keybuffer_push(keybuffer_t *keybuffer, const kbd_event_t *ev) { futex_down(&keybuffer_futex); @@ -110,5 +110,5 @@ * */ -bool keybuffer_pop(keybuffer_t *keybuffer, console_event_t *edst) +bool keybuffer_pop(keybuffer_t *keybuffer, kbd_event_t *edst) { futex_down(&keybuffer_futex); Index: uspace/srv/hid/console/keybuffer.h =================================================================== --- uspace/srv/hid/console/keybuffer.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/console/keybuffer.h (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -46,5 +46,5 @@ typedef struct { - console_event_t fifo[KEYBUFFER_SIZE]; + kbd_event_t fifo[KEYBUFFER_SIZE]; size_t head; size_t tail; @@ -56,6 +56,6 @@ extern size_t keybuffer_available(keybuffer_t *); extern bool keybuffer_empty(keybuffer_t *); -extern void keybuffer_push(keybuffer_t *, const console_event_t *); -extern bool keybuffer_pop(keybuffer_t *, console_event_t *); +extern void keybuffer_push(keybuffer_t *, const kbd_event_t *); +extern bool keybuffer_pop(keybuffer_t *, kbd_event_t *); #endif Index: uspace/srv/hid/fb/ega.c =================================================================== --- uspace/srv/hid/fb/ega.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/fb/ega.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -52,7 +52,9 @@ #include #include - #include "ega.h" #include "main.h" + +// FIXME: remove this header +#include #define MAX_SAVED_SCREENS 256 @@ -291,6 +293,5 @@ int retval; - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + if (!IPC_GET_IMETHOD(call)) { client_connected = 0; async_answer_0(callid, EOK); @@ -298,4 +299,7 @@ /* Exit thread */ return; + } + + switch (IPC_GET_IMETHOD(call)) { case IPC_M_SHARE_OUT: /* We accept one area for data interchange */ Index: uspace/srv/hid/fb/fb.c =================================================================== --- uspace/srv/hid/fb/fb.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/fb/fb.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -59,12 +59,13 @@ #include #include - #include "font-8x16.h" #include "fb.h" #include "main.h" #include "ppm.h" - #include "pointer.xbm" #include "pointer_mask.xbm" + +// FIXME: remove this header +#include #define DEFAULT_BGCOLOR 0xf0f0f0 @@ -1620,6 +1621,5 @@ continue; - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + if (!IPC_GET_IMETHOD(call)) { client_connected = false; @@ -1630,5 +1630,7 @@ /* Exit thread */ return; + } + switch (IPC_GET_IMETHOD(call)) { case FB_PUTCHAR: ch = IPC_GET_ARG1(call); Index: uspace/srv/hid/fb/main.c =================================================================== --- uspace/srv/hid/fb/main.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/fb/main.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -28,5 +28,5 @@ #include -#include +#include #include #include Index: uspace/srv/hid/fb/serial_console.c =================================================================== --- uspace/srv/hid/fb/serial_console.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/fb/serial_console.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -52,4 +52,7 @@ #include "serial_console.h" +// FIXME: remove this header +#include + #define MAX_CONTROL 20 @@ -344,6 +347,5 @@ int retval; - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + if (!IPC_GET_IMETHOD(call)) { client_connected = 0; async_answer_0(callid, EOK); @@ -351,4 +353,7 @@ /* Exit thread */ return; + } + + switch (IPC_GET_IMETHOD(call)) { case IPC_M_SHARE_OUT: /* We accept one area for data interchange */ Index: uspace/srv/hid/kbd/ctl/apple.c =================================================================== --- uspace/srv/hid/kbd/ctl/apple.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/ctl/apple.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -52,5 +52,5 @@ void kbd_ctl_parse_scancode(int scancode) { - console_ev_type_t type; + kbd_event_type_t type; unsigned int key; Index: uspace/srv/hid/kbd/ctl/pc.c =================================================================== --- uspace/srv/hid/kbd/ctl/pc.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/ctl/pc.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -205,5 +205,5 @@ void kbd_ctl_parse_scancode(int scancode) { - console_ev_type_t type; + kbd_event_type_t type; unsigned int key; int *map; Index: uspace/srv/hid/kbd/ctl/sun.c =================================================================== --- uspace/srv/hid/kbd/ctl/sun.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/ctl/sun.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -53,5 +53,5 @@ void kbd_ctl_parse_scancode(int scancode) { - console_ev_type_t type; + kbd_event_type_t type; unsigned int key; Index: uspace/srv/hid/kbd/generic/kbd.c =================================================================== --- uspace/srv/hid/kbd/generic/kbd.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/generic/kbd.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -43,6 +43,8 @@ #include #include -#include +#include +#include #include +#include #include #include @@ -50,9 +52,11 @@ #include #include - #include #include #include #include + +// FIXME: remove this header +#include #define NAME "kbd" @@ -88,5 +92,5 @@ void kbd_push_ev(int type, unsigned int key) { - console_event_t ev; + kbd_event_t ev; unsigned mod_mask; @@ -163,5 +167,5 @@ ev.c = layout[active_layout]->parse_ev(&ev); - async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c); + async_obsolete_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c); } @@ -174,10 +178,10 @@ async_answer_0(iid, EOK); - while (1) { + while (true) { callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + + if (!IPC_GET_IMETHOD(call)) { if (client_phone != -1) { - async_hangup(client_phone); + async_obsolete_hangup(client_phone); client_phone = -1; } @@ -185,4 +189,7 @@ async_answer_0(callid, EOK); return; + } + + switch (IPC_GET_IMETHOD(call)) { case IPC_M_CONNECT_TO_ME: if (client_phone != -1) { @@ -222,5 +229,5 @@ if (irc_service) { while (irc_phone < 0) - irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); + irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0); } Index: uspace/srv/hid/kbd/include/layout.h =================================================================== --- uspace/srv/hid/kbd/include/layout.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/include/layout.h (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -43,5 +43,5 @@ typedef struct { void (*reset)(void); - wchar_t (*parse_ev)(console_event_t *); + wchar_t (*parse_ev)(kbd_event_t *); } layout_op_t; Index: uspace/srv/hid/kbd/layout/cz.c =================================================================== --- uspace/srv/hid/kbd/layout/cz.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/layout/cz.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -39,5 +39,5 @@ static void layout_reset(void); -static wchar_t layout_parse_ev(console_event_t *ev); +static wchar_t layout_parse_ev(kbd_event_t *ev); enum m_state { @@ -273,5 +273,5 @@ } -static wchar_t parse_ms_hacek(console_event_t *ev) +static wchar_t parse_ms_hacek(kbd_event_t *ev) { wchar_t c; @@ -291,5 +291,5 @@ } -static wchar_t parse_ms_carka(console_event_t *ev) +static wchar_t parse_ms_carka(kbd_event_t *ev) { wchar_t c; @@ -309,5 +309,5 @@ } -static wchar_t parse_ms_start(console_event_t *ev) +static wchar_t parse_ms_start(kbd_event_t *ev) { wchar_t c; @@ -384,5 +384,5 @@ } -static wchar_t layout_parse_ev(console_event_t *ev) +static wchar_t layout_parse_ev(kbd_event_t *ev) { if (ev->type != KEY_PRESS) Index: uspace/srv/hid/kbd/layout/us_dvorak.c =================================================================== --- uspace/srv/hid/kbd/layout/us_dvorak.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/layout/us_dvorak.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,5 +38,5 @@ static void layout_reset(void); -static wchar_t layout_parse_ev(console_event_t *ev); +static wchar_t layout_parse_ev(kbd_event_t *ev); layout_op_t us_dvorak_op = { @@ -210,5 +210,5 @@ } -static wchar_t layout_parse_ev(console_event_t *ev) +static wchar_t layout_parse_ev(kbd_event_t *ev) { wchar_t c; Index: uspace/srv/hid/kbd/layout/us_qwerty.c =================================================================== --- uspace/srv/hid/kbd/layout/us_qwerty.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/layout/us_qwerty.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,5 +38,5 @@ static void layout_reset(void); -static wchar_t layout_parse_ev(console_event_t *ev); +static wchar_t layout_parse_ev(kbd_event_t *ev); layout_op_t us_qwerty_op = { @@ -204,5 +204,5 @@ } -static wchar_t layout_parse_ev(console_event_t *ev) +static wchar_t layout_parse_ev(kbd_event_t *ev) { wchar_t c; Index: uspace/srv/hid/kbd/port/adb.c =================================================================== --- uspace/srv/hid/kbd/port/adb.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/port/adb.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -30,5 +30,5 @@ * @ingroup kbd * @{ - */ + */ /** @file * @brief ADB keyboard port driver. @@ -37,4 +37,5 @@ #include #include +#include #include #include @@ -42,4 +43,6 @@ #include #include +#include +#include static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall); @@ -52,28 +55,25 @@ int kbd_port_init(void) { - const char *input = "/dev/adb/kbd"; - int input_fd; - - printf(NAME ": open %s\n", input); - - input_fd = open(input, O_RDONLY); - if (input_fd < 0) { - printf(NAME ": Failed opening %s (%d)\n", input, input_fd); - return false; + const char *dev = "adb/kbd"; + devmap_handle_t handle; + + int rc = devmap_device_get_handle(dev, &handle, 0); + if (rc == EOK) { + dev_phone = devmap_obsolete_device_connect(handle, 0); + if (dev_phone < 0) { + printf("%s: Failed to connect to device\n", NAME); + return dev_phone; + } + } else + return rc; + + /* NB: The callback connection is slotted for removal */ + rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events); + if (rc != EOK) { + printf(NAME ": Failed to create callback from device\n"); + return rc; } - - dev_phone = fd_phone(input_fd); - if (dev_phone < 0) { - printf(NAME ": Failed to connect to device\n"); - return false; - } - - /* NB: The callback connection is slotted for removal */ - if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) { - printf(NAME ": Failed to create callback from device\n"); - return false; - } - - return 0; + + return EOK; } @@ -100,9 +100,11 @@ int retval; - - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + + if (!IPC_GET_IMETHOD(call)) { /* TODO: Handle hangup */ return; + } + + switch (IPC_GET_IMETHOD(call)) { case ADB_REG_NOTIF: adb_kbd_reg0_data(IPC_GET_ARG1(call)); Index: uspace/srv/hid/kbd/port/chardev.c =================================================================== --- uspace/srv/hid/kbd/port/chardev.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/port/chardev.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -30,5 +30,5 @@ * @ingroup kbd * @{ - */ + */ /** @file * @brief Chardev keyboard port driver. @@ -37,10 +37,13 @@ #include #include +#include #include #include -#include -#include -#include +#include +#include #include +#include + +#define NAME "kbd/chardev" static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall); @@ -48,47 +51,37 @@ static int dev_phone; -#define NAME "kbd" - /** List of devices to try connecting to. */ static const char *in_devs[] = { - "/dev/char/ps2a", - "/dev/char/s3c24ser" + "char/ps2a", + "char/s3c24ser" }; -static const int num_devs = sizeof(in_devs) / sizeof(in_devs[0]); +static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]); int kbd_port_init(void) { - int input_fd; - int i; - - input_fd = -1; + devmap_handle_t handle; + unsigned int i; + int rc; + for (i = 0; i < num_devs; i++) { - struct stat s; - - if (stat(in_devs[i], &s) == EOK) + rc = devmap_device_get_handle(in_devs[i], &handle, 0); + if (rc == EOK) break; } - + if (i >= num_devs) { - printf(NAME ": Could not find any suitable input device.\n"); + printf("%s: Could not find any suitable input device\n", NAME); return -1; } - - input_fd = open(in_devs[i], O_RDONLY); - if (input_fd < 0) { - printf(NAME ": failed opening device %s (%d).\n", in_devs[i], - input_fd); - return -1; + + dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING); + if (dev_phone < 0) { + printf("%s: Failed connecting to device\n", NAME); + return ENOENT; } - - dev_phone = fd_phone(input_fd); - if (dev_phone < 0) { - printf(NAME ": Failed connecting to device\n"); - return -1; - } - + /* NB: The callback connection is slotted for removal */ - if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) { + if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) { printf(NAME ": Failed to create callback from device\n"); return -1; @@ -108,5 +101,5 @@ void kbd_port_write(uint8_t data) { - async_msg_1(dev_phone, CHAR_WRITE_BYTE, data); + async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data); } @@ -118,11 +111,13 @@ ipc_call_t call; ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } int retval; switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - /* TODO: Handle hangup */ - return; case CHAR_NOTIF_BYTE: kbd_push_scancode(IPC_GET_ARG1(call)); Index: uspace/srv/hid/kbd/port/ns16550.c =================================================================== --- uspace/srv/hid/kbd/port/ns16550.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/port/ns16550.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -37,4 +37,5 @@ #include #include +#include #include #include @@ -121,5 +122,5 @@ if (irc_service) - async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, + async_obsolete_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call)); } Index: uspace/srv/hid/kbd/port/z8530.c =================================================================== --- uspace/srv/hid/kbd/port/z8530.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/kbd/port/z8530.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -37,4 +37,5 @@ #include #include +#include #include #include @@ -109,5 +110,5 @@ if (irc_service) - async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, + async_obsolete_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call)); } Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c =================================================================== --- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -44,4 +44,5 @@ #include #include +#include #include #include @@ -50,6 +51,8 @@ #include #include - #include "s3c24xx_ts.h" + +// FIXME: remove this header +#include #define NAME "s3c24ser" @@ -280,5 +283,5 @@ button = 1; press = 0; - async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press); + async_obsolete_msg_2(ts->client_phone, MEVENT_BUTTON, button, press); s3c24xx_ts_wait_for_int_mode(ts, updn_down); @@ -321,6 +324,6 @@ /* Send notifications to client. */ - async_msg_2(ts->client_phone, MEVENT_MOVE, dx, dy); - async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press); + async_obsolete_msg_2(ts->client_phone, MEVENT_MOVE, dx, dy); + async_obsolete_msg_2(ts->client_phone, MEVENT_BUTTON, button, press); ts->last_x = x_pos; @@ -380,8 +383,8 @@ while (1) { callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: + + if (!IPC_GET_IMETHOD(call)) { if (ts->client_phone != -1) { - async_hangup(ts->client_phone); + async_obsolete_hangup(ts->client_phone); ts->client_phone = -1; } @@ -389,4 +392,7 @@ async_answer_0(callid, EOK); return; + } + + switch (IPC_GET_IMETHOD(call)) { case IPC_M_CONNECT_TO_ME: if (ts->client_phone != -1) { Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -48,6 +48,10 @@ #include #include +#include #include #include "cuda_adb.h" + +// FIXME: remove this header +#include #define NAME "cuda_adb" @@ -219,9 +223,12 @@ callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case IPC_M_CONNECT_TO_ME: if (adb_dev[dev_addr].client_phone != -1) { @@ -479,5 +486,5 @@ return; - async_msg_1(adb_dev[dev_addr].client_phone, ADB_REG_NOTIF, reg_val); + async_obsolete_msg_1(adb_dev[dev_addr].client_phone, ADB_REG_NOTIF, reg_val); } Index: uspace/srv/hw/char/i8042/i8042.c =================================================================== --- uspace/srv/hw/char/i8042/i8042.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/char/i8042/i8042.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -41,4 +41,5 @@ #include #include +#include #include #include @@ -46,6 +47,8 @@ #include #include - #include "i8042.h" + +// FIXME: remove this header +#include #define NAME "i8042" @@ -247,9 +250,12 @@ callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case IPC_M_CONNECT_TO_ME: printf(NAME ": creating callback connection\n"); @@ -300,5 +306,5 @@ if (i8042_port[devid].client_phone != -1) { - async_msg_1(i8042_port[devid].client_phone, + async_obsolete_msg_1(i8042_port[devid].client_phone, IPC_FIRST_USER_METHOD, data); } Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -42,4 +42,5 @@ #include #include +#include #include #include @@ -48,6 +49,8 @@ #include #include - #include "s3c24xx_uart.h" + +// FIXME: remove this header +#include #define NAME "s3c24ser" @@ -123,9 +126,12 @@ callid = async_get_call(&call); method = IPC_GET_IMETHOD(call); - switch (method) { - case IPC_M_PHONE_HUNGUP: + + if (!method) { /* The other side has hung up. */ async_answer_0(callid, EOK); return; + } + + switch (method) { case IPC_M_CONNECT_TO_ME: printf(NAME ": creating callback connection\n"); @@ -156,5 +162,5 @@ if (uart->client_phone != -1) { - async_msg_1(uart->client_phone, CHAR_NOTIF_BYTE, + async_obsolete_msg_1(uart->client_phone, CHAR_NOTIF_BYTE, data); } Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/irc/apic/apic.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include @@ -79,4 +79,10 @@ callid = async_get_call(&call); + if (!IPC_GET_IMETHOD(call)) { + /* The other side has hung up. */ + async_answer_0(callid, EOK); + return; + } + switch (IPC_GET_IMETHOD(call)) { case IRC_ENABLE_INTERRUPT: @@ -87,8 +93,4 @@ async_answer_0(callid, EOK); break; - case IPC_M_PHONE_HUNGUP: - /* The other side has hung up. */ - async_answer_0(callid, EOK); - return; default: async_answer_0(callid, EINVAL); @@ -106,5 +108,5 @@ if ((sysinfo_get_value("apic", &apic) != EOK) || (!apic)) { - printf(NAME ": No APIC found\n"); + printf("%s: No APIC found\n", NAME); return false; } @@ -118,10 +120,11 @@ int main(int argc, char **argv) { - printf(NAME ": HelenOS APIC driver\n"); + printf("%s: HelenOS APIC driver\n", NAME); if (!apic_init()) return -1; - printf(NAME ": Accepting connections\n"); + printf("%s: Accepting connections\n", NAME); + task_retval(0); async_manager(); Index: uspace/srv/hw/irc/fhc/fhc.c =================================================================== --- uspace/srv/hw/irc/fhc/fhc.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/irc/fhc/fhc.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include @@ -53,5 +53,5 @@ #define NAME "fhc" -#define FHC_UART_INR 0x39 +#define FHC_UART_INR 0x39 #define FHC_UART_IMAP 0x0 @@ -128,10 +128,10 @@ if (retval < 0) { - printf(NAME ": Error mapping FHC UART registers\n"); + printf("%s: Error mapping FHC UART registers\n", NAME); return false; } - printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys, - fhc_uart_size); + printf("%s: FHC UART registers at %p, %zu bytes\n", NAME, + fhc_uart_phys, fhc_uart_size); async_set_client_connection(fhc_connection); @@ -143,12 +143,13 @@ int main(int argc, char **argv) { - printf(NAME ": HelenOS FHC bus controller driver\n"); + printf("%s: HelenOS FHC bus controller driver\n", NAME); if (!fhc_init()) return -1; - printf(NAME ": Accepting connections\n"); + printf("%s: Accepting connections\n", NAME); + task_retval(0); async_manager(); - + /* Never reached */ return 0; @@ -157,3 +158,3 @@ /** * @} - */ + */ Index: uspace/srv/hw/irc/i8259/i8259.c =================================================================== --- uspace/srv/hw/irc/i8259/i8259.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/irc/i8259/i8259.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include @@ -113,4 +113,10 @@ callid = async_get_call(&call); + if (!IPC_GET_IMETHOD(call)) { + /* The other side has hung up. */ + async_answer_0(callid, EOK); + return; + } + switch (IPC_GET_IMETHOD(call)) { case IRC_ENABLE_INTERRUPT: @@ -121,8 +127,4 @@ async_answer_0(callid, EOK); break; - case IPC_M_PHONE_HUNGUP: - /* The other side has hung up. */ - async_answer_0(callid, EOK); - return; default: async_answer_0(callid, EINVAL); @@ -140,5 +142,5 @@ if ((sysinfo_get_value("i8259", &i8259) != EOK) || (!i8259)) { - printf(NAME ": No i8259 found\n"); + printf("%s: No i8259 found\n", NAME); return false; } @@ -148,5 +150,5 @@ (pio_enable((void *) IO_RANGE1_START, IO_RANGE1_SIZE, (void **) &io_range1) != EOK)) { - printf(NAME ": i8259 not accessible\n"); + printf("%s: i8259 not accessible\n", NAME); return false; } @@ -160,10 +162,11 @@ int main(int argc, char **argv) { - printf(NAME ": HelenOS i8259 driver\n"); + printf("%s: HelenOS i8259 driver\n", NAME); if (!i8259_init()) return -1; - printf(NAME ": Accepting connections\n"); + printf("%s: Accepting connections\n", NAME); + task_retval(0); async_manager(); Index: uspace/srv/hw/irc/obio/obio.c =================================================================== --- uspace/srv/hw/irc/obio/obio.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/irc/obio/obio.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -44,5 +44,5 @@ #include #include -#include +#include #include #include @@ -118,5 +118,5 @@ if (sysinfo_get_value("obio.base.physical", &paddr) != EOK) { - printf(NAME ": no OBIO registers found\n"); + printf("%s: No OBIO registers found\n", NAME); return false; } @@ -130,9 +130,9 @@ if (retval < 0) { - printf(NAME ": Error mapping OBIO registers\n"); + printf("%s: Error mapping OBIO registers\n", NAME); return false; } - printf(NAME ": OBIO registers with base at %p\n", base_phys); + printf("%s: OBIO registers with base at %p\n", NAME, base_phys); async_set_client_connection(obio_connection); @@ -144,12 +144,13 @@ int main(int argc, char **argv) { - printf(NAME ": HelenOS OBIO driver\n"); + printf("%s: HelenOS OBIO driver\n", NAME); if (!obio_init()) return -1; - printf(NAME ": Accepting connections\n"); + printf("%s: Accepting connections\n", NAME); + task_retval(0); async_manager(); - + /* Never reached */ return 0; @@ -158,3 +159,3 @@ /** * @} - */ + */ Index: uspace/srv/hw/netif/ne2000/ne2000.c =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/hw/netif/ne2000/ne2000.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,4 +38,5 @@ #include #include +#include #include #include @@ -44,5 +45,6 @@ #include #include -#include +#include +#include #include #include @@ -330,5 +332,5 @@ if (irc_service) - async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq); + async_obsolete_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq); } @@ -389,10 +391,10 @@ if (irc_service) { while (irc_phone < 0) - irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); + irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0); } async_set_interrupt_received(irq_handler); - return async_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL); + return service_register(SERVICE_NE2000); } Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/loader/main.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -52,6 +52,5 @@ #include #include -#include -#include +#include #include #include @@ -60,5 +59,4 @@ #include #include - #include #include @@ -414,8 +412,4 @@ static void ldr_connection(ipc_callid_t iid, ipc_call_t *icall) { - ipc_callid_t callid; - ipc_call_t call; - int retval; - /* Already have a connection? */ if (connected) { @@ -430,13 +424,15 @@ /* Ignore parameters, the connection is already open */ - (void) iid; (void) icall; - while (1) { - callid = async_get_call(&call); + while (true) { + int retval; + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) + exit(0); switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - exit(0); case LOADER_GET_TASKID: ldr_get_taskid(callid, &call); @@ -465,6 +461,5 @@ } - if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) - async_answer_0(callid, retval); + async_answer_0(callid, retval); } } @@ -479,5 +474,5 @@ /* Introduce this task to the NS (give it our task ID). */ task_id_t id = task_get_id(); - int rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id)); + int rc = ns_intro(id); if (rc != EOK) return -1; Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/il/arp/arp.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -845,8 +845,9 @@ *count = 0; + + if (!IPC_GET_IMETHOD(*call)) + return EOK; + switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_PHONE_HUNGUP: - return EOK; - case NET_ARP_DEVICE: rc = measured_strings_receive(&address, &data, 1); Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/il/ip/ip.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -76,4 +76,7 @@ #include #include + +// FIXME: remove this header +#include /** IP module name. */ @@ -1913,8 +1916,9 @@ *answer_count = 0; + + if (!IPC_GET_IMETHOD(*call)) + return EOK; + switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_PHONE_HUNGUP: - return EOK; - case IPC_M_CONNECT_TO_ME: return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call), Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/net/net.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -41,4 +41,5 @@ #include #include +#include #include #include @@ -339,5 +340,5 @@ goto out; - rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL); + rc = service_register(SERVICE_NETWORKING); if (rc != EOK) goto out; @@ -638,7 +639,9 @@ *answer_count = 0; + + if (!IPC_GET_IMETHOD(*call)) + return EOK; + switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_PHONE_HUNGUP: - return EOK; case NET_NET_GET_DEVICE_CONF: rc = measured_strings_receive(&strings, &data, @@ -703,5 +706,5 @@ /* End if told to either by the message or the processing result */ - if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP)) + if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP)) return; Index: uspace/srv/net/netif/lo/lo.c =================================================================== --- uspace/srv/net/netif/lo/lo.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/netif/lo/lo.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -39,4 +39,5 @@ #include #include +#include #include #include @@ -164,5 +165,5 @@ int netif_initialize(void) { - return async_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, NULL); + return service_register(SERVICE_LO); } Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/nil/eth/eth.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -59,4 +59,7 @@ #include #include + +// FIXME: remove this header +#include #include "eth.h" @@ -846,8 +849,9 @@ *answer_count = 0; + + if (!IPC_GET_IMETHOD(*call)) + return EOK; + switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_PHONE_HUNGUP: - return EOK; - case NET_NIL_DEVICE: return eth_device_message(IPC_GET_DEVICE(*call), Index: uspace/srv/net/nil/nildummy/nildummy.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/nil/nildummy/nildummy.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -54,4 +54,7 @@ #include +// FIXME: remove this header +#include + #include "nildummy.h" @@ -393,8 +396,9 @@ *answer_count = 0; + + if (!IPC_GET_IMETHOD(*call)) + return EOK; + switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_PHONE_HUNGUP: - return EOK; - case NET_NIL_DEVICE: return nildummy_device_message(IPC_GET_DEVICE(*call), Index: uspace/srv/net/tl/icmp/icmp.c =================================================================== --- uspace/srv/net/tl/icmp/icmp.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/tl/icmp/icmp.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -612,9 +612,11 @@ static void icmp_receiver(ipc_callid_t iid, ipc_call_t *icall) { - bool loop = true; packet_t *packet; int rc; - while (loop) { + while (true) { + if (!IPC_GET_IMETHOD(*icall)) + break; + switch (IPC_GET_IMETHOD(*icall)) { case NET_TL_RECEIVED: @@ -629,7 +631,4 @@ async_answer_0(iid, (sysarg_t) rc); break; - case IPC_M_PHONE_HUNGUP: - loop = false; - continue; default: async_answer_0(iid, (sysarg_t) ENOTSUP); Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/tl/tcp/tcp.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -38,4 +38,5 @@ #include #include +#include #include #include @@ -72,4 +73,7 @@ #include "tcp.h" #include "tcp_header.h" + +// FIXME: remove this header +#include /** TCP module name. */ @@ -799,5 +803,5 @@ /* Notify the destination socket */ - async_msg_5(socket->phone, NET_SOCKET_RECEIVED, + async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED, (sysarg_t) socket->socket_id, ((packet_dimension->content < socket_data->data_fragment_size) ? @@ -820,5 +824,5 @@ /* Notify the destination socket */ - async_msg_5(socket->phone, NET_SOCKET_RECEIVED, + async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED, (sysarg_t) socket->socket_id, 0, 0, 0, @@ -1078,5 +1082,5 @@ if (rc == EOK) { /* Notify the destination socket */ - async_msg_5(socket->phone, NET_SOCKET_ACCEPTED, + async_obsolete_msg_5(socket->phone, NET_SOCKET_ACCEPTED, (sysarg_t) listening_socket->socket_id, socket_data->data_fragment_size, TCP_HEADER_SIZE, @@ -1269,5 +1273,4 @@ { int res; - bool keep_on_going = true; socket_cores_t local_sockets; int app_phone = IPC_GET_PHONE(call); @@ -1293,5 +1296,5 @@ fibril_rwlock_initialize(&lock); - while (keep_on_going) { + while (true) { /* Answer the call */ @@ -1301,12 +1304,12 @@ /* Get the next call */ callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) { + res = EHANGUP; + break; + } /* Process the call */ switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - keep_on_going = false; - res = EHANGUP; - break; - case NET_SOCKET: socket_data = @@ -1506,5 +1509,5 @@ /* Release the application phone */ - async_hangup(app_phone); + async_obsolete_hangup(app_phone); printf("release\n"); Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/net/tl/udp/udp.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -37,4 +37,5 @@ #include +#include #include #include @@ -69,4 +70,7 @@ #include "udp.h" #include "udp_header.h" + +// FIXME: remove this header +#include /** UDP module name. */ @@ -299,5 +303,5 @@ /* Notify the destination socket */ fibril_rwlock_write_unlock(&udp_globals.lock); - async_msg_5(socket->phone, NET_SOCKET_RECEIVED, + async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED, (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0, (sysarg_t) fragments); @@ -748,5 +752,4 @@ { int res; - bool keep_on_going = true; socket_cores_t local_sockets; int app_phone = IPC_GET_PHONE(call); @@ -773,5 +776,5 @@ socket_cores_initialize(&local_sockets); - while (keep_on_going) { + while (true) { /* Answer the call */ @@ -783,12 +786,12 @@ /* Get the next call */ callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) { + res = EHANGUP; + break; + } /* Process the call */ switch (IPC_GET_IMETHOD(call)) { - case IPC_M_PHONE_HUNGUP: - keep_on_going = false; - res = EHANGUP; - break; - case NET_SOCKET: socket_id = SOCKET_GET_SOCKET_ID(call); @@ -880,5 +883,5 @@ /* Release the application phone */ - async_hangup(app_phone); + async_obsolete_hangup(app_phone); /* Release all local sockets */ Index: uspace/srv/taskmon/taskmon.c =================================================================== --- uspace/srv/taskmon/taskmon.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/taskmon/taskmon.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -92,14 +92,15 @@ int main(int argc, char *argv[]) { - printf(NAME ": Task Monitoring Service\n"); - + printf("%s: Task Monitoring Service\n", NAME); + if (event_subscribe(EVENT_FAULT, 0) != EOK) { - printf(NAME ": Error registering fault notifications.\n"); + printf("%s: Error registering fault notifications.\n", NAME); return -1; } - + async_set_interrupt_received(fault_event); + task_retval(0); async_manager(); - + return 0; } Index: uspace/srv/vfs/vfs.c =================================================================== --- uspace/srv/vfs/vfs.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -37,5 +37,5 @@ #include -#include +#include #include #include @@ -51,6 +51,6 @@ static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall) { - bool keep_on_going = true; - + bool cont = true; + /* * The connection was opened via the IPC_CONNECT_ME_TO call. @@ -59,15 +59,15 @@ async_answer_0(iid, EOK); - while (keep_on_going) { + while (cont) { 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: - keep_on_going = false; - break; case VFS_IN_REGISTER: vfs_register(callid, &call); - keep_on_going = false; + cont = false; break; case VFS_IN_MOUNT: @@ -123,5 +123,5 @@ } } - + /* * Open files for this client will be cleaned up when its last Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs.h (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -53,5 +53,5 @@ vfs_info_t vfs_info; fs_handle_t fs_handle; - async_sess_t session; + async_sess_t *sess; } fs_info_t; @@ -167,6 +167,6 @@ extern fibril_rwlock_t namespace_rwlock; -extern int vfs_grab_phone(fs_handle_t); -extern void vfs_release_phone(fs_handle_t, int); +extern async_exch_t *vfs_exchange_grab(fs_handle_t); +extern void vfs_exchange_release(async_exch_t *); extern fs_handle_t fs_name_to_handle(char *, bool); Index: uspace/srv/vfs/vfs_file.c =================================================================== --- uspace/srv/vfs/vfs_file.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs_file.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -45,5 +45,5 @@ #include "vfs.h" -#define VFS_DATA ((vfs_client_data_t *) async_client_data_get()) +#define VFS_DATA ((vfs_client_data_t *) async_get_client_data()) #define FILES (VFS_DATA->files) @@ -110,20 +110,19 @@ static int vfs_file_close_remote(vfs_file_t *file) { + assert(!file->refcnt); + + async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle); + ipc_call_t answer; - aid_t msg; + aid_t msg = async_send_2(exch, VFS_OUT_CLOSE, file->node->devmap_handle, + file->node->index, &answer); + + vfs_exchange_release(exch); + sysarg_t rc; - int phone; - - assert(!file->refcnt); - - phone = vfs_grab_phone(file->node->fs_handle); - msg = async_send_2(phone, VFS_OUT_CLOSE, file->node->devmap_handle, - file->node->index, &answer); async_wait_for(msg, &rc); - vfs_release_phone(file->node->fs_handle, phone); - + return IPC_GET_ARG1(answer); } - /** Increment reference count of VFS file structure. Index: uspace/srv/vfs/vfs_lookup.c =================================================================== --- uspace/srv/vfs/vfs_lookup.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs_lookup.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -159,6 +159,6 @@ ipc_call_t answer; - int phone = vfs_grab_phone(root->fs_handle); - aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (sysarg_t) first, + async_exch_t *exch = vfs_exchange_grab(root->fs_handle); + aid_t req = async_send_5(exch, VFS_OUT_LOOKUP, (sysarg_t) first, (sysarg_t) (first + len - 1) % PLB_SIZE, (sysarg_t) root->devmap_handle, (sysarg_t) lflag, (sysarg_t) index, @@ -167,5 +167,5 @@ sysarg_t rc; async_wait_for(req, &rc); - vfs_release_phone(root->fs_handle, phone); + vfs_exchange_release(exch); fibril_mutex_lock(&plb_mutex); @@ -208,8 +208,8 @@ int vfs_open_node_internal(vfs_lookup_res_t *result) { - int phone = vfs_grab_phone(result->triplet.fs_handle); + async_exch_t *exch = vfs_exchange_grab(result->triplet.fs_handle); ipc_call_t answer; - aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE, + aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE, (sysarg_t) result->triplet.devmap_handle, (sysarg_t) result->triplet.index, &answer); @@ -217,5 +217,5 @@ sysarg_t rc; async_wait_for(req, &rc); - vfs_release_phone(result->triplet.fs_handle, phone); + vfs_exchange_release(exch); if (rc == EOK) { Index: uspace/srv/vfs/vfs_node.c =================================================================== --- uspace/srv/vfs/vfs_node.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs_node.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -104,11 +104,14 @@ bool free_vfs_node = false; bool free_fs_node = false; - - fibril_mutex_lock(&nodes_mutex); + + fibril_mutex_lock(&nodes_mutex); + if (node->refcnt-- == 1) { + /* * We are dropping the last reference to this node. * Remove it from the VFS node hash table. */ + unsigned long key[] = { [KEY_FS_HANDLE] = node->fs_handle, @@ -116,23 +119,29 @@ [KEY_INDEX] = node->index }; + hash_table_remove(&nodes, key, 3); free_vfs_node = true; + if (!node->lnkcnt) free_fs_node = true; } - fibril_mutex_unlock(&nodes_mutex); - + + fibril_mutex_unlock(&nodes_mutex); + if (free_fs_node) { - /* + + /* * The node is not visible in the file system namespace. * Free up its resources. */ - int phone = vfs_grab_phone(node->fs_handle); - sysarg_t rc; - rc = async_req_2_0(phone, VFS_OUT_DESTROY, - (sysarg_t)node->devmap_handle, (sysarg_t)node->index); + + async_exch_t *exch = vfs_exchange_grab(node->fs_handle); + sysarg_t rc = async_req_2_0(exch, VFS_OUT_DESTROY, + (sysarg_t) node->devmap_handle, (sysarg_t)node->index); + assert(rc == EOK); - vfs_release_phone(node->fs_handle, phone); + vfs_exchange_release(exch); } + if (free_vfs_node) free(node); Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs_ops.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -78,6 +78,6 @@ size_t rsize; unsigned rlnkcnt; + async_exch_t *exch; sysarg_t rc; - int phone; aid_t msg; ipc_call_t answer; @@ -123,13 +123,14 @@ /* Tell the mountee that it is being mounted. */ - phone = vfs_grab_phone(fs_handle); - msg = async_send_1(phone, VFS_OUT_MOUNTED, + exch = vfs_exchange_grab(fs_handle); + msg = async_send_1(exch, VFS_OUT_MOUNTED, (sysarg_t) devmap_handle, &answer); - /* send the mount options */ - rc = async_data_write_start(phone, (void *)opts, + /* Send the mount options */ + rc = async_data_write_start(exch, (void *)opts, str_size(opts)); + vfs_exchange_release(exch); + if (rc != EOK) { async_wait_for(msg, NULL); - vfs_release_phone(fs_handle, phone); fibril_rwlock_write_unlock(&namespace_rwlock); async_answer_0(rid, rc); @@ -137,5 +138,4 @@ } async_wait_for(msg, &rc); - vfs_release_phone(fs_handle, phone); if (rc != EOK) { @@ -182,9 +182,9 @@ */ - int mountee_phone = vfs_grab_phone(fs_handle); - assert(mountee_phone >= 0); - - phone = vfs_grab_phone(mp_res.triplet.fs_handle); - msg = async_send_4(phone, VFS_OUT_MOUNT, + async_exch_t *mountee_exch = vfs_exchange_grab(fs_handle); + assert(mountee_exch); + + exch = vfs_exchange_grab(mp_res.triplet.fs_handle); + msg = async_send_4(exch, VFS_OUT_MOUNT, (sysarg_t) mp_res.triplet.devmap_handle, (sysarg_t) mp_res.triplet.index, @@ -192,34 +192,38 @@ (sysarg_t) devmap_handle, &answer); - /* send connection */ - rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone); - if (rc != EOK) { + /* Send connection */ + rc = async_exchange_clone(exch, mountee_exch); + vfs_exchange_release(mountee_exch); + + if (rc != EOK) { + vfs_exchange_release(exch); async_wait_for(msg, NULL); - vfs_release_phone(fs_handle, mountee_phone); - vfs_release_phone(mp_res.triplet.fs_handle, phone); + /* Mount failed, drop reference to mp_node. */ if (mp_node) vfs_node_put(mp_node); - async_answer_0(rid, rc); - fibril_rwlock_write_unlock(&namespace_rwlock); - return; - } - - vfs_release_phone(fs_handle, mountee_phone); + + async_answer_0(rid, rc); + fibril_rwlock_write_unlock(&namespace_rwlock); + return; + } /* send the mount options */ - rc = async_data_write_start(phone, (void *)opts, str_size(opts)); - if (rc != EOK) { + rc = async_data_write_start(exch, (void *) opts, str_size(opts)); + if (rc != EOK) { + vfs_exchange_release(exch); async_wait_for(msg, NULL); - vfs_release_phone(mp_res.triplet.fs_handle, phone); + /* Mount failed, drop reference to mp_node. */ if (mp_node) vfs_node_put(mp_node); - fibril_rwlock_write_unlock(&namespace_rwlock); - async_answer_0(rid, rc); - return; - } + + fibril_rwlock_write_unlock(&namespace_rwlock); + async_answer_0(rid, rc); + return; + } + + vfs_exchange_release(exch); async_wait_for(msg, &rc); - vfs_release_phone(mp_res.triplet.fs_handle, phone); if (rc == EOK) { @@ -227,5 +231,5 @@ rsize = (size_t) IPC_GET_ARG2(answer); rlnkcnt = (unsigned) IPC_GET_ARG3(answer); - + mr_res.triplet.fs_handle = fs_handle; mr_res.triplet.devmap_handle = devmap_handle; @@ -234,5 +238,5 @@ mr_res.lnkcnt = rlnkcnt; mr_res.type = VFS_NODE_DIRECTORY; - + /* Add reference to the mounted root. */ mr_node = vfs_node_get(&mr_res); @@ -243,5 +247,5 @@ vfs_node_put(mp_node); } - + async_answer_0(rid, rc); fibril_rwlock_write_unlock(&namespace_rwlock); @@ -303,10 +307,10 @@ /* - * Wait for IPC_M_PING so that we can return an error if we don't know + * Wait for VFS_IN_PING so that we can return an error if we don't know * fs_name. */ ipc_call_t data; ipc_callid_t callid = async_get_call(&data); - if (IPC_GET_IMETHOD(data) != IPC_M_PING) { + if (IPC_GET_IMETHOD(data) != VFS_IN_PING) { async_answer_0(callid, ENOTSUP); async_answer_0(rid, ENOTSUP); @@ -358,6 +362,6 @@ vfs_lookup_res_t mr_res; vfs_node_t *mr_node; - int phone; - + async_exch_t *exch; + /* * Receive the mount point path. @@ -367,5 +371,5 @@ if (rc != EOK) async_answer_0(rid, rc); - + /* * Taking the namespace lock will do two things for us. First, it will @@ -395,5 +399,5 @@ return; } - + /* * Count the total number of references for the mounted file system. We @@ -411,7 +415,7 @@ return; } - + if (str_cmp(mp, "/") == 0) { - + /* * Unmounting the root file system. @@ -420,10 +424,12 @@ * VFS_OUT_UNMOUNTED directly to the mounted file system. */ - + free(mp); - phone = vfs_grab_phone(mr_node->fs_handle); - rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED, + + exch = vfs_exchange_grab(mr_node->fs_handle); + rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED, mr_node->devmap_handle); - vfs_release_phone(mr_node->fs_handle, phone); + vfs_exchange_release(exch); + if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); @@ -432,8 +438,9 @@ return; } + rootfs.fs_handle = 0; rootfs.devmap_handle = 0; } else { - + /* * Unmounting a non-root file system. @@ -442,5 +449,5 @@ * file system, so we delegate the operation to it. */ - + rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL); free(mp); @@ -451,4 +458,5 @@ return; } + vfs_node_t *mp_node = vfs_node_get(&mp_res); if (!mp_node) { @@ -458,9 +466,10 @@ return; } - - phone = vfs_grab_phone(mp_node->fs_handle); - rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, + + exch = vfs_exchange_grab(mp_node->fs_handle); + rc = async_req_2_0(exch, VFS_OUT_UNMOUNT, mp_node->devmap_handle, mp_node->index); - vfs_release_phone(mp_node->fs_handle, phone); + vfs_exchange_release(exch); + if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); @@ -470,5 +479,5 @@ return; } - + /* Drop the reference we got above. */ vfs_node_put(mp_node); @@ -476,6 +485,5 @@ vfs_node_put(mp_node); } - - + /* * All went well, the mounted file system was successfully unmounted. @@ -483,5 +491,5 @@ */ vfs_node_forget(mr_node); - + fibril_rwlock_write_unlock(&namespace_rwlock); async_answer_0(rid, EOK); @@ -698,19 +706,20 @@ */ fibril_mutex_lock(&file->lock); - int fs_phone = vfs_grab_phone(file->node->fs_handle); + async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle); /* Make a VFS_OUT_SYMC request at the destination FS server. */ aid_t msg; ipc_call_t answer; - msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->devmap_handle, + msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->devmap_handle, file->node->index, &answer); - + + vfs_exchange_release(fs_exch); + /* Wait for reply from the FS server. */ sysarg_t rc; async_wait_for(msg, &rc); - vfs_release_phone(file->node->fs_handle, fs_phone); fibril_mutex_unlock(&file->lock); - + vfs_file_put(file); async_answer_0(rid, rc); @@ -720,7 +729,5 @@ { int fd = IPC_GET_ARG1(*request); - int ret; - - ret = vfs_fd_free(fd); + int ret = vfs_fd_free(fd); async_answer_0(rid, ret); } @@ -728,6 +735,4 @@ static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read) { - vfs_info_t *vi; - /* * The following code strongly depends on the fact that the files data @@ -739,5 +744,5 @@ * open files supports parallel access! */ - + int fd = IPC_GET_ARG1(*request); @@ -754,8 +759,8 @@ */ fibril_mutex_lock(&file->lock); - - vi = fs_handle_to_info(file->node->fs_handle); - assert(vi); - + + vfs_info_t *fs_info = fs_handle_to_info(file->node->fs_handle); + assert(fs_info); + /* * Lock the file's node so that no other client can read/write to it at @@ -763,9 +768,10 @@ * write implementation does not modify the file size. */ - if (read || (vi->concurrent_read_write && vi->write_retains_size)) + if ((read) || + ((fs_info->concurrent_read_write) && (fs_info->write_retains_size))) fibril_rwlock_read_lock(&file->node->contents_rwlock); else fibril_rwlock_write_lock(&file->node->contents_rwlock); - + if (file->node->type == VFS_NODE_DIRECTORY) { /* @@ -777,5 +783,5 @@ } - int fs_phone = vfs_grab_phone(file->node->fs_handle); + async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle); /* @@ -789,5 +795,5 @@ ipc_call_t answer; if (read) { - rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ, + rc = async_data_read_forward_3_1(fs_exch, VFS_OUT_READ, file->node->devmap_handle, file->node->index, file->pos, &answer); @@ -796,10 +802,10 @@ file->pos = file->node->size; - rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE, + rc = async_data_write_forward_3_1(fs_exch, VFS_OUT_WRITE, file->node->devmap_handle, file->node->index, file->pos, &answer); } - vfs_release_phone(file->node->fs_handle, fs_phone); + vfs_exchange_release(fs_exch); size_t bytes = IPC_GET_ARG1(answer); @@ -809,5 +815,6 @@ /* Unlock the VFS node. */ - if (read || (vi->concurrent_read_write && vi->write_retains_size)) + if ((read) || + ((fs_info->concurrent_read_write) && (fs_info->write_retains_size))) fibril_rwlock_read_unlock(&file->node->contents_rwlock); else { @@ -929,12 +936,11 @@ fs_index_t index, aoff64_t size) { - sysarg_t rc; - int fs_phone; - - fs_phone = vfs_grab_phone(fs_handle); - rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (sysarg_t) devmap_handle, - (sysarg_t) index, LOWER32(size), UPPER32(size)); - vfs_release_phone(fs_handle, fs_phone); - return (int)rc; + async_exch_t *exch = vfs_exchange_grab(fs_handle); + sysarg_t rc = async_req_4_0(exch, VFS_OUT_TRUNCATE, + (sysarg_t) devmap_handle, (sysarg_t) index, LOWER32(size), + UPPER32(size)); + vfs_exchange_release(exch); + + return (int) rc; } @@ -986,13 +992,15 @@ fibril_mutex_lock(&file->lock); - int fs_phone = vfs_grab_phone(file->node->fs_handle); + async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle); aid_t msg; - msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle, + msg = async_send_3(exch, VFS_OUT_STAT, file->node->devmap_handle, file->node->index, true, NULL); - async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + + vfs_exchange_release(exch); + async_wait_for(msg, &rc); - vfs_release_phone(file->node->fs_handle, fs_phone); - + fibril_mutex_unlock(&file->lock); vfs_file_put(file); @@ -1037,13 +1045,15 @@ fibril_rwlock_read_unlock(&namespace_rwlock); - int fs_phone = vfs_grab_phone(node->fs_handle); + async_exch_t *exch = vfs_exchange_grab(node->fs_handle); + aid_t msg; - msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle, + msg = async_send_3(exch, VFS_OUT_STAT, node->devmap_handle, node->index, false, NULL); - async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + + vfs_exchange_release(exch); sysarg_t rv; async_wait_for(msg, &rv); - vfs_release_phone(node->fs_handle, fs_phone); async_answer_0(rid, rv); Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/srv/vfs/vfs_register.c (revision 4a4c8bcf0ce34cbf901b7d7d1d02ef84f5b04d48) @@ -62,12 +62,13 @@ /** Verify the VFS info structure. * - * @param info Info structure to be verified. - * - * @return Non-zero if the info structure is sane, zero otherwise. + * @param info Info structure to be verified. + * + * @return Non-zero if the info structure is sane, zero otherwise. + * */ static bool vfs_info_sane(vfs_info_t *info) { int i; - + /* * Check if the name is non-empty and is composed solely of ASCII @@ -78,4 +79,5 @@ return false; } + for (i = 1; i < FS_NAME_MAXLEN; i++) { if (!(islower(info->name[i]) || isdigit(info->name[i])) && @@ -90,4 +92,5 @@ } } + /* * This check is not redundant. It ensures that the name is @@ -104,11 +107,10 @@ /** VFS_REGISTER protocol function. * - * @param rid Hash of the call with the request. - * @param request Call structure with the request. + * @param rid Hash of the call with the request. + * @param request Call structure with the request. + * */ void vfs_register(ipc_callid_t rid, ipc_call_t *request) { - int phone; - dprintf("Processing VFS_REGISTER request received from %p.\n", request->in_phone_hash); @@ -174,20 +176,14 @@ * which to forward VFS requests to it. */ - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) { - dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call)); + fs_info->sess = async_callback_receive(EXCHANGE_PARALLEL); + if (!fs_info->sess) { + dprintf("Callback connection expected\n"); list_remove(&fs_info->fs_link); fibril_mutex_unlock(&fs_head_lock); free(fs_info); - async_answer_0(callid, EINVAL); async_answer_0(rid, EINVAL); return; } - phone = IPC_GET_ARG5(call); - async_session_create(&fs_info->session, phone, 0); - async_answer_0(callid, EOK); - dprintf("Callback connection to FS created.\n"); @@ -197,10 +193,10 @@ size_t size; + ipc_callid_t callid; if (!async_share_in_receive(&callid, &size)) { dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call)); list_remove(&fs_info->fs_link); fibril_mutex_unlock(&fs_head_lock); - async_session_destroy(&fs_info->session); - async_hangup(phone); + async_hangup(fs_info->sess); free(fs_info); async_answer_0(callid, EINVAL); @@ -216,6 +212,5 @@ list_remove(&fs_info->fs_link); fibril_mutex_unlock(&fs_head_lock); - async_session_destroy(&fs_info->session); - async_hangup(phone); + async_hangup(fs_info->sess); free(fs_info); async_answer_0(callid, EINVAL); @@ -247,69 +242,59 @@ } -/** For a given file system handle, implement policy for allocating a phone. - * - * @param handle File system handle. - * - * @return Phone over which a multi-call request can be safely - * sent. Return 0 if no phone was found. - */ -int vfs_grab_phone(fs_handle_t handle) -{ +/** Begin an exchange for a given file system handle + * + * @param handle File system handle. + * + * @return Exchange for a multi-call request. + * @return NULL if no such file exists. + * + */ +async_exch_t *vfs_exchange_grab(fs_handle_t handle) +{ + /* + * For now, we don't try to be very clever and very fast. + * We simply lookup the session in the fs_head list and + * begin an exchange. + */ + fibril_mutex_lock(&fs_head_lock); + link_t *cur; - fs_info_t *fs; - int phone; - - /* - * For now, we don't try to be very clever and very fast. We simply - * lookup the phone in the fs_head list and duplicate it. The duplicate - * phone will be returned to the client and the client will use it for - * communication. In the future, we should cache the connections so - * that they do not have to be reestablished over and over again. - */ - fibril_mutex_lock(&fs_head_lock); for (cur = fs_head.next; cur != &fs_head; cur = cur->next) { - fs = list_get_instance(cur, fs_info_t, fs_link); + fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); + if (fs->fs_handle == handle) { fibril_mutex_unlock(&fs_head_lock); - phone = async_exchange_begin(&fs->session); - - assert(phone > 0); - return phone; + + assert(fs->sess); + async_exch_t *exch = async_exchange_begin(fs->sess); + + assert(exch); + return exch; } } + fibril_mutex_unlock(&fs_head_lock); - return 0; -} - -/** Tell VFS that the phone is not needed anymore. - * - * @param phone Phone to FS task. - */ -void vfs_release_phone(fs_handle_t handle, int phone) -{ - link_t *cur; - fs_info_t *fs; - - fibril_mutex_lock(&fs_head_lock); - for (cur = fs_head.next; cur != &fs_head; cur = cur->next) { - fs = list_get_instance(cur, fs_info_t, fs_link); - if (fs->fs_handle == handle) { - fibril_mutex_unlock(&fs_head_lock); - async_exchange_end(&fs->session, phone); - return; - } - } - /* should not really get here */ - abort(); - fibril_mutex_unlock(&fs_head_lock); + + return NULL; +} + +/** End VFS server exchange. + * + * @param exch VFS server exchange. + * + */ +void vfs_exchange_release(async_exch_t *exch) +{ + async_exchange_end(exch); } /** Convert file system name to its handle. * - * @param name File system name. - * @param lock If true, the function will lock and unlock the - * fs_head_lock. - * - * @return File system handle or zero if file system not found. + * @param name File system name. + * @param lock If true, the function will lock and unlock the + * fs_head_lock. + * + * @return File system handle or zero if file system not found. + * */ fs_handle_t fs_name_to_handle(char *name, bool lock) @@ -319,4 +304,5 @@ if (lock) fibril_mutex_lock(&fs_head_lock); + link_t *cur; for (cur = fs_head.next; cur != &fs_head; cur = cur->next) { @@ -327,6 +313,8 @@ } } + if (lock) fibril_mutex_unlock(&fs_head_lock); + return handle; } @@ -334,6 +322,8 @@ /** Find the VFS info structure. * - * @param handle FS handle for which the VFS info structure is sought. - * @return VFS info structure on success or NULL otherwise. + * @param handle FS handle for which the VFS info structure is sought. + * + * @return VFS info structure on success or NULL otherwise. + * */ vfs_info_t *fs_handle_to_info(fs_handle_t handle) @@ -341,5 +331,5 @@ vfs_info_t *info = NULL; link_t *cur; - + fibril_mutex_lock(&fs_head_lock); for (cur = fs_head.next; cur != &fs_head; cur = cur->next) { @@ -351,5 +341,5 @@ } fibril_mutex_unlock(&fs_head_lock); - + return info; } @@ -357,3 +347,3 @@ /** * @} - */ + */