Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/devman/devman.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -590,5 +590,5 @@ } - ipc_hangup(phone); + async_hangup(phone); /* @@ -787,5 +787,5 @@ if (phone >= 0) { add_device(phone, drv, node, tree); - ipc_hangup(phone); + async_hangup(phone); } } Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/devman/devman.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -40,5 +40,4 @@ #include #include -#include #include #include Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/devman/main.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -75,5 +75,5 @@ iid = async_get_call(&icall); if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) { - ipc_answer_0(iid, EREFUSED); + async_answer_0(iid, EREFUSED); return NULL; } @@ -84,5 +84,5 @@ int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0); if (rc != EOK) { - ipc_answer_0(iid, rc); + async_answer_0(iid, rc); return NULL; } @@ -98,5 +98,5 @@ free(drv_name); drv_name = NULL; - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); return NULL; } @@ -110,6 +110,6 @@ ipc_callid_t callid = async_get_call(&call); if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) { - ipc_answer_0(callid, ENOTSUP); - ipc_answer_0(iid, ENOTSUP); + async_answer_0(callid, ENOTSUP); + async_answer_0(iid, ENOTSUP); return NULL; } @@ -121,6 +121,6 @@ driver->name); - ipc_answer_0(callid, EOK); - ipc_answer_0(iid, EOK); + async_answer_0(callid, EOK); + async_answer_0(iid, EOK); return driver; @@ -144,5 +144,5 @@ printf(NAME ": ERROR: devman_receive_match_id - invalid " "protocol.\n"); - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); delete_match_id(match_id); return EINVAL; @@ -152,9 +152,9 @@ printf(NAME ": ERROR: devman_receive_match_id - failed to " "allocate match id.\n"); - ipc_answer_0(callid, ENOMEM); + async_answer_0(callid, ENOMEM); return ENOMEM; } - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); match_id->score = IPC_GET_ARG1(call); @@ -219,5 +219,5 @@ if (parent == NULL) { fibril_rwlock_write_unlock(&tree->rwlock); - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); return; } @@ -227,5 +227,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&tree->rwlock); - ipc_answer_0(callid, rc); + async_answer_0(callid, rc); return; } @@ -235,5 +235,5 @@ fibril_rwlock_write_unlock(&tree->rwlock); delete_dev_node(node); - ipc_answer_0(callid, ENOMEM); + async_answer_0(callid, ENOMEM); return; } @@ -264,5 +264,5 @@ /* Return device handle to parent's driver. */ - ipc_answer_1(callid, EOK, node->handle); + async_answer_1(callid, EOK, node->handle); } @@ -302,5 +302,5 @@ 0, 0, 0, 0); if (rc != EOK) { - ipc_answer_0(callid, rc); + async_answer_0(callid, rc); return; } @@ -308,5 +308,5 @@ node_t *dev = find_dev_node(&device_tree, handle); if (dev == NULL) { - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); return; } @@ -321,5 +321,5 @@ "asigned to it\n", dev->pathname, class_name, class_info->dev_name); - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); } @@ -343,5 +343,5 @@ { /* Accept the connection. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); driver_t *driver = devman_driver_register(); @@ -379,5 +379,5 @@ break; default: - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); break; } @@ -393,5 +393,5 @@ int rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0); if (rc != EOK) { - ipc_answer_0(iid, rc); + async_answer_0(iid, rc); return; } @@ -402,9 +402,9 @@ if (dev == NULL) { - ipc_answer_0(iid, ENOENT); - return; - } - - ipc_answer_1(iid, EOK, dev->handle); + async_answer_0(iid, ENOENT); + return; + } + + async_answer_1(iid, EOK, dev->handle); } @@ -414,5 +414,5 @@ { /* Accept connection. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); bool cont = true; @@ -429,5 +429,5 @@ break; default: - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); } } @@ -443,5 +443,5 @@ printf(NAME ": devman_forward error - no device with handle %" PRIun " was found.\n", handle); - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); return; } @@ -460,5 +460,5 @@ printf(NAME ": devman_forward error - the device is not in %" PRIun " usable state.\n", handle); - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); return; } @@ -474,5 +474,5 @@ driver->name); printf("the driver's phone is %" PRIun ").\n", driver->phone); - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -480,5 +480,5 @@ printf(NAME ": devman_forward: forward connection to device %s to " "driver %s.\n", dev->pathname, driver->name); - ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE); + async_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE); } @@ -495,14 +495,14 @@ if (dev == NULL || dev->drv == NULL) { - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); return; } if (dev->state != DEVICE_USABLE || dev->drv->phone <= 0) { - ipc_answer_0(iid, EINVAL); - return; - } - - ipc_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, dev->handle, 0, + async_answer_0(iid, EINVAL); + return; + } + + async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, dev->handle, 0, IPC_FF_NONE); printf(NAME ": devman_connection_devmapper: forwarded connection to " @@ -535,5 +535,5 @@ default: /* No such interface */ - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); } }