Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -51,5 +51,4 @@ #include #include -#include #include #include @@ -282,13 +281,13 @@ if (disk_id < 0 || disk[disk_id].present == false) { - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); if (!async_share_out_receive(&callid, &comm_size, &flags)) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -296,5 +295,5 @@ fs_va = as_get_mappable_page(comm_size); if (fs_va == NULL) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -308,5 +307,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case BD_READ_BLOCKS: @@ -331,8 +330,8 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, block_size); + async_answer_1(callid, EOK, block_size); continue; case BD_GET_NUM_BLOCKS: - ipc_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks), + async_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks), UPPER32(disk[disk_id].blocks)); continue; @@ -341,5 +340,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/bd/file_bd/file_bd.c =================================================================== --- uspace/srv/bd/file_bd/file_bd.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/bd/file_bd/file_bd.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -41,5 +41,4 @@ #include #include -#include #include #include @@ -184,8 +183,8 @@ /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); if (!async_share_out_receive(&callid, &comm_size, &flags)) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -193,5 +192,5 @@ fs_va = as_get_mappable_page(comm_size); if (fs_va == NULL) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -205,5 +204,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case BD_READ_BLOCKS: @@ -228,8 +227,8 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, block_size); + async_answer_1(callid, EOK, block_size); continue; case BD_GET_NUM_BLOCKS: - ipc_answer_2(callid, EOK, LOWER32(num_blocks), + async_answer_2(callid, EOK, LOWER32(num_blocks), UPPER32(num_blocks)); continue; @@ -238,5 +237,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/bd/gxe_bd/gxe_bd.c =================================================================== --- uspace/srv/bd/gxe_bd/gxe_bd.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/bd/gxe_bd/gxe_bd.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -177,18 +176,18 @@ if (disk_id < 0) { - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); if (!async_share_out_receive(&callid, &comm_size, &flags)) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } if (comm_size < block_size) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -196,5 +195,5 @@ fs_va = as_get_mappable_page(comm_size); if (fs_va == NULL) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -208,5 +207,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case BD_READ_BLOCKS: @@ -231,5 +230,5 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, block_size); + async_answer_1(callid, EOK, block_size); continue; case BD_GET_NUM_BLOCKS: @@ -240,5 +239,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/bd/part/guid_part/guid_part.c =================================================================== --- uspace/srv/bd/part/guid_part/guid_part.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/bd/part/guid_part/guid_part.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -47,5 +47,4 @@ #include #include -#include #include #include @@ -335,5 +334,5 @@ if (part == NULL) { - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -342,8 +341,8 @@ /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); if (!async_share_out_receive(&callid, &comm_size, &flags)) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -351,5 +350,5 @@ fs_va = as_get_mappable_page(comm_size); if (fs_va == NULL) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -363,5 +362,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case BD_READ_BLOCKS: @@ -386,8 +385,8 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, block_size); + async_answer_1(callid, EOK, block_size); continue; case BD_GET_NUM_BLOCKS: - ipc_answer_2(callid, EOK, LOWER32(part->length), + async_answer_2(callid, EOK, LOWER32(part->length), UPPER32(part->length)); continue; @@ -396,5 +395,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/bd/part/mbr_part/mbr_part.c =================================================================== --- uspace/srv/bd/part/mbr_part/mbr_part.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/bd/part/mbr_part/mbr_part.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -57,5 +57,4 @@ #include #include -#include #include #include @@ -413,5 +412,5 @@ if (part == NULL) { - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -420,8 +419,8 @@ /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); if (!async_share_out_receive(&callid, &comm_size, &flags)) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -429,5 +428,5 @@ fs_va = as_get_mappable_page(comm_size); if (fs_va == NULL) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -441,5 +440,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case BD_READ_BLOCKS: @@ -464,8 +463,8 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, block_size); + async_answer_1(callid, EOK, block_size); continue; case BD_GET_NUM_BLOCKS: - ipc_answer_2(callid, EOK, LOWER32(part->length), + async_answer_2(callid, EOK, LOWER32(part->length), UPPER32(part->length)); continue; @@ -474,5 +473,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/bd/rd/rd.c =================================================================== --- uspace/srv/bd/rd/rd.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/bd/rd/rd.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ */ -#include #include #include @@ -98,5 +97,5 @@ * Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); /* @@ -109,5 +108,5 @@ (void) async_share_out_finalize(callid, fs_va); } else { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -118,5 +117,5 @@ * Close the connection. */ - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -130,5 +129,5 @@ * Answer the message and exit the fibril. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case BD_READ_BLOCKS: @@ -153,8 +152,8 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, block_size); + async_answer_1(callid, EOK, block_size); continue; case BD_GET_NUM_BLOCKS: - ipc_answer_2(callid, EOK, LOWER32(rd_size / block_size), + async_answer_2(callid, EOK, LOWER32(rd_size / block_size), UPPER32(rd_size / block_size)); continue; @@ -169,5 +168,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/clip/clip.c =================================================================== --- uspace/srv/clip/clip.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/clip/clip.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -30,5 +30,4 @@ #include #include -#include #include #include @@ -63,10 +62,10 @@ fibril_mutex_unlock(&clip_mtx); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); break; case CLIPBOARD_TAG_DATA: rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); break; } @@ -82,8 +81,8 @@ fibril_mutex_unlock(&clip_mtx); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); break; default: - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); } } @@ -100,6 +99,6 @@ case CLIPBOARD_TAG_DATA: if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); break; } @@ -107,6 +106,6 @@ if (clip_tag != CLIPBOARD_TAG_DATA) { /* So far we only understand binary data */ - ipc_answer_0(callid, EOVERFLOW); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(callid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); break; } @@ -114,6 +113,6 @@ if (clip_size != size) { /* The client expects different size of data */ - ipc_answer_0(callid, EOVERFLOW); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(callid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); break; } @@ -121,9 +120,9 @@ sysarg_t retval = async_data_read_finalize(callid, clip_data, size); if (retval != EOK) { - ipc_answer_0(rid, retval); + async_answer_0(rid, retval); break; } - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); default: /* @@ -131,5 +130,5 @@ * data from the clipbard */ - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); break; } @@ -146,5 +145,5 @@ fibril_mutex_unlock(&clip_mtx); - ipc_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag); + async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag); } @@ -152,5 +151,5 @@ { /* Accept connection */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); bool cont = true; @@ -173,5 +172,5 @@ break; default: - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); } } 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); } } Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/devmap/devmap.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -374,5 +374,5 @@ if (IPC_GET_IMETHOD(icall) != DEVMAP_DRIVER_REGISTER) { - ipc_answer_0(iid, EREFUSED); + async_answer_0(iid, EREFUSED); return NULL; } @@ -381,5 +381,5 @@ (devmap_driver_t *) malloc(sizeof(devmap_driver_t)); if (driver == NULL) { - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return NULL; } @@ -392,5 +392,5 @@ if (rc != EOK) { free(driver); - ipc_answer_0(iid, rc); + async_answer_0(iid, rc); return NULL; } @@ -405,11 +405,11 @@ free(driver->name); free(driver); - ipc_answer_0(callid, ENOTSUP); - ipc_answer_0(iid, ENOTSUP); + async_answer_0(callid, ENOTSUP); + async_answer_0(iid, ENOTSUP); return NULL; } driver->phone = IPC_GET_ARG5(call); - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); /* @@ -438,5 +438,5 @@ fibril_mutex_unlock(&drivers_list_mutex); - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); return driver; @@ -456,5 +456,5 @@ if (driver->phone != 0) - ipc_hangup(driver->phone); + async_hangup(driver->phone); /* Remove it from list of drivers */ @@ -491,5 +491,5 @@ { if (driver == NULL) { - ipc_answer_0(iid, EREFUSED); + async_answer_0(iid, EREFUSED); return; } @@ -499,5 +499,5 @@ (devmap_device_t *) malloc(sizeof(devmap_device_t)); if (device == NULL) { - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -512,5 +512,5 @@ if (rc != EOK) { free(device); - ipc_answer_0(iid, rc); + async_answer_0(iid, rc); return; } @@ -520,5 +520,5 @@ free(fqdn); free(device); - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -534,5 +534,5 @@ free(device->name); free(device); - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -549,5 +549,5 @@ free(device->name); free(device); - ipc_answer_0(iid, EEXISTS); + async_answer_0(iid, EEXISTS); return; } @@ -571,5 +571,5 @@ fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_1(iid, EOK, device->handle); + async_answer_1(iid, EOK, device->handle); } @@ -602,14 +602,14 @@ if ((dev == NULL) || (dev->driver == NULL) || (dev->driver->phone == 0)) { fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); return; } if (dev->forward_interface == 0) { - ipc_forward_fast(callid, dev->driver->phone, + async_forward_fast(callid, dev->driver->phone, dev->handle, 0, 0, IPC_FF_NONE); } else { - ipc_forward_fast(callid, dev->driver->phone, + async_forward_fast(callid, dev->driver->phone, dev->forward_interface, dev->handle, 0, IPC_FF_NONE); @@ -633,5 +633,5 @@ DEVMAP_NAME_MAXLEN, 0, NULL); if (rc != EOK) { - ipc_answer_0(iid, rc); + async_answer_0(iid, rc); return; } @@ -641,5 +641,5 @@ if (!devmap_fqdn_split(fqdn, &ns_name, &name)) { free(fqdn); - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -668,5 +668,5 @@ } - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); free(ns_name); free(name); @@ -675,5 +675,5 @@ } - ipc_answer_1(iid, EOK, dev->handle); + async_answer_1(iid, EOK, dev->handle); fibril_mutex_unlock(&devices_list_mutex); @@ -696,5 +696,5 @@ DEVMAP_NAME_MAXLEN, 0, NULL); if (rc != EOK) { - ipc_answer_0(iid, rc); + async_answer_0(iid, rc); return; } @@ -721,5 +721,5 @@ } - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); free(name); fibril_mutex_unlock(&devices_list_mutex); @@ -727,5 +727,5 @@ } - ipc_answer_1(iid, EOK, namespace->handle); + async_answer_1(iid, EOK, namespace->handle); fibril_mutex_unlock(&devices_list_mutex); @@ -743,9 +743,9 @@ devmap_device_find_handle(IPC_GET_ARG1(*icall)); if (dev == NULL) - ipc_answer_1(iid, EOK, DEV_HANDLE_NONE); + async_answer_1(iid, EOK, DEV_HANDLE_NONE); else - ipc_answer_1(iid, EOK, DEV_HANDLE_DEVICE); + async_answer_1(iid, EOK, DEV_HANDLE_DEVICE); } else - ipc_answer_1(iid, EOK, DEV_HANDLE_NAMESPACE); + async_answer_1(iid, EOK, DEV_HANDLE_NAMESPACE); fibril_mutex_unlock(&devices_list_mutex); @@ -755,5 +755,5 @@ { fibril_mutex_lock(&devices_list_mutex); - ipc_answer_1(iid, EOK, list_count(&namespaces_list)); + async_answer_1(iid, EOK, list_count(&namespaces_list)); fibril_mutex_unlock(&devices_list_mutex); } @@ -766,7 +766,7 @@ devmap_namespace_find_handle(IPC_GET_ARG1(*icall)); if (namespace == NULL) - ipc_answer_0(iid, EEXISTS); + async_answer_0(iid, EEXISTS); else - ipc_answer_1(iid, EOK, namespace->refcnt); + async_answer_1(iid, EOK, namespace->refcnt); fibril_mutex_unlock(&devices_list_mutex); @@ -778,12 +778,12 @@ size_t size; if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EREFUSED); - ipc_answer_0(iid, EREFUSED); + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); return; } if ((size % sizeof(dev_desc_t)) != 0) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(iid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -794,6 +794,6 @@ if (count != list_count(&namespaces_list)) { fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(callid, EOVERFLOW); - ipc_answer_0(iid, EOVERFLOW); + async_answer_0(callid, EOVERFLOW); + async_answer_0(iid, EOVERFLOW); return; } @@ -802,6 +802,6 @@ if (desc == NULL) { fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(callid, ENOMEM); - ipc_answer_0(iid, ENOMEM); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -824,5 +824,5 @@ fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(iid, retval); + async_answer_0(iid, retval); } @@ -835,12 +835,12 @@ size_t size; if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EREFUSED); - ipc_answer_0(iid, EREFUSED); + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); return; } if ((size % sizeof(dev_desc_t)) != 0) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(iid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(iid, EINVAL); return; } @@ -852,6 +852,6 @@ if (namespace == NULL) { fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(callid, ENOENT); - ipc_answer_0(iid, ENOENT); + async_answer_0(callid, ENOENT); + async_answer_0(iid, ENOENT); return; } @@ -860,6 +860,6 @@ if (count != namespace->refcnt) { fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(callid, EOVERFLOW); - ipc_answer_0(iid, EOVERFLOW); + async_answer_0(callid, EOVERFLOW); + async_answer_0(iid, EOVERFLOW); return; } @@ -868,6 +868,6 @@ if (desc == NULL) { fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(callid, ENOMEM); - ipc_answer_0(iid, EREFUSED); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, EREFUSED); return; } @@ -891,5 +891,5 @@ fibril_mutex_unlock(&devices_list_mutex); - ipc_answer_0(iid, retval); + async_answer_0(iid, retval); } @@ -910,5 +910,5 @@ if (!fnd) { fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -920,5 +920,5 @@ if (dev_name == NULL) { fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -928,5 +928,5 @@ if (device == NULL) { fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -938,5 +938,5 @@ fibril_mutex_lock(&devices_list_mutex); fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_0(iid, ENOMEM); + async_answer_0(iid, ENOMEM); return; } @@ -960,5 +960,5 @@ fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_1(iid, EOK, (sysarg_t) i); + async_answer_1(iid, EOK, (sysarg_t) i); } @@ -967,5 +967,5 @@ sysarg_t i = IPC_GET_ARG1(*icall); if (i >= NULL_DEVICES) { - ipc_answer_0(iid, ELIMIT); + async_answer_0(iid, ELIMIT); return; } @@ -975,5 +975,5 @@ if (null_devices[i] == NULL) { fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); return; } @@ -986,5 +986,5 @@ fibril_mutex_unlock(&null_devices_mutex); - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); } @@ -1012,5 +1012,5 @@ { /* Accept connection */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); devmap_driver_t *driver = devmap_driver_register(); @@ -1029,7 +1029,7 @@ case DEVMAP_DRIVER_UNREGISTER: if (NULL == driver) - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); else - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; case DEVMAP_DEVICE_REGISTER: @@ -1048,5 +1048,5 @@ break; default: - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); } } @@ -1067,5 +1067,5 @@ { /* Accept connection */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); bool cont = true; @@ -1106,5 +1106,5 @@ break; default: - ipc_answer_0(callid, ENOENT); + async_answer_0(callid, ENOENT); } } @@ -1130,5 +1130,5 @@ default: /* No such interface */ - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); } } Index: uspace/srv/fs/devfs/devfs.c =================================================================== --- uspace/srv/fs/devfs/devfs.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/devfs/devfs.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -40,5 +40,4 @@ #include -#include #include #include @@ -63,5 +62,5 @@ { if (iid) - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { @@ -112,5 +111,5 @@ break; default: - ipc_answer_0(callid, ENOTSUP); + async_answer_0(callid, ENOTSUP); break; } Index: uspace/srv/fs/devfs/devfs_ops.c =================================================================== --- uspace/srv/fs/devfs/devfs_ops.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/devfs/devfs_ops.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ */ -#include #include #include @@ -465,10 +464,10 @@ 0, NULL); if (retval != EOK) { - ipc_answer_0(rid, retval); + async_answer_0(rid, retval); return; } free(opts); - ipc_answer_3(rid, EOK, 0, 0, 0); + async_answer_3(rid, EOK, 0, 0, 0); } @@ -480,5 +479,5 @@ void devfs_unmounted(ipc_callid_t rid, ipc_call_t *request) { - ipc_answer_0(rid, ENOTSUP); + async_answer_0(rid, ENOTSUP); } @@ -513,6 +512,6 @@ size_t size; if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -535,5 +534,5 @@ async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); free(desc); - ipc_answer_1(rid, EOK, 1); + async_answer_1(rid, EOK, 1); return; } @@ -550,5 +549,5 @@ async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); free(desc); - ipc_answer_1(rid, EOK, 1); + async_answer_1(rid, EOK, 1); return; } @@ -557,6 +556,6 @@ } - ipc_answer_0(callid, ENOENT); - ipc_answer_1(rid, ENOENT, 0); + async_answer_0(callid, ENOENT); + async_answer_1(rid, ENOENT, 0); return; } @@ -569,6 +568,6 @@ size_t size; if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -580,11 +579,11 @@ async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); free(desc); - ipc_answer_1(rid, EOK, 1); + async_answer_1(rid, EOK, 1); return; } free(desc); - ipc_answer_0(callid, ENOENT); - ipc_answer_1(rid, ENOENT, 0); + async_answer_0(callid, ENOENT); + async_answer_1(rid, ENOENT, 0); return; } @@ -601,5 +600,5 @@ if (lnk == NULL) { fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -611,6 +610,6 @@ if (!async_data_read_receive(&callid, NULL)) { fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -623,5 +622,5 @@ /* Forward the IPC_M_DATA_READ request to the driver */ - ipc_forward_fast(callid, dev->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, dev->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); fibril_mutex_unlock(&devices_mutex); @@ -632,9 +631,9 @@ /* Driver reply is the final result of the whole operation */ - ipc_answer_1(rid, rc, bytes); - return; - } - - ipc_answer_0(rid, ENOENT); + async_answer_1(rid, rc, bytes); + return; + } + + async_answer_0(rid, ENOENT); } @@ -643,5 +642,5 @@ fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request); if (index == 0) { - ipc_answer_0(rid, ENOTSUP); + async_answer_0(rid, ENOTSUP); return; } @@ -651,5 +650,5 @@ if (type == DEV_HANDLE_NAMESPACE) { /* Namespace directory */ - ipc_answer_0(rid, ENOTSUP); + async_answer_0(rid, ENOTSUP); return; } @@ -665,5 +664,5 @@ if (lnk == NULL) { fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -675,6 +674,6 @@ if (!async_data_write_receive(&callid, NULL)) { fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -687,5 +686,5 @@ /* Forward the IPC_M_DATA_WRITE request to the driver */ - ipc_forward_fast(callid, dev->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, dev->phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); fibril_mutex_unlock(&devices_mutex); @@ -697,14 +696,14 @@ /* Driver reply is the final result of the whole operation */ - ipc_answer_1(rid, rc, bytes); - return; - } - - ipc_answer_0(rid, ENOENT); + async_answer_1(rid, rc, bytes); + return; + } + + async_answer_0(rid, ENOENT); } void devfs_truncate(ipc_callid_t rid, ipc_call_t *request) { - ipc_answer_0(rid, ENOTSUP); + async_answer_0(rid, ENOTSUP); } @@ -714,5 +713,5 @@ if (index == 0) { - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return; } @@ -722,5 +721,5 @@ if (type == DEV_HANDLE_NAMESPACE) { /* Namespace directory */ - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return; } @@ -735,5 +734,5 @@ if (lnk == NULL) { fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -744,5 +743,5 @@ if (dev->refcount == 0) { - ipc_hangup(dev->phone); + async_hangup(dev->phone); hash_table_remove(&devices, key, DEVICES_KEYS); } @@ -750,9 +749,9 @@ fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(rid, EOK); - return; - } - - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, EOK); + return; + } + + async_answer_0(rid, ENOENT); } @@ -762,5 +761,5 @@ if (index == 0) { - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return; } @@ -770,5 +769,5 @@ if (type == DEV_HANDLE_NAMESPACE) { /* Namespace directory */ - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return; } @@ -783,5 +782,5 @@ if (lnk == NULL) { fibril_mutex_unlock(&devices_mutex); - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -802,14 +801,14 @@ /* Driver reply is the final result of the whole operation */ - ipc_answer_0(rid, rc); - return; - } - - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, rc); + return; + } + + async_answer_0(rid, ENOENT); } void devfs_destroy(ipc_callid_t rid, ipc_call_t *request) { - ipc_answer_0(rid, ENOTSUP); + async_answer_0(rid, ENOTSUP); } Index: uspace/srv/fs/devfs/devfs_ops.h =================================================================== --- uspace/srv/fs/devfs/devfs_ops.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/devfs/devfs_ops.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,5 @@ #define DEVFS_DEVFS_OPS_H_ -#include +#include #include Index: uspace/srv/fs/fat/fat.c =================================================================== --- uspace/srv/fs/fat/fat.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/fat/fat.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -38,5 +38,4 @@ #include "fat.h" -#include #include #include @@ -85,5 +84,5 @@ * created by IPC_M_CONNECT_TO_ME. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); } @@ -137,5 +136,5 @@ break; default: - ipc_answer_0(callid, ENOTSUP); + async_answer_0(callid, ENOTSUP); break; } Index: uspace/srv/fs/fat/fat.h =================================================================== --- uspace/srv/fs/fat/fat.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/fat/fat.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ #include "fat_fat.h" -#include #include #include Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/fat/fat_ops.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -42,5 +42,4 @@ #include #include -#include #include #include @@ -955,5 +954,5 @@ if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -970,5 +969,5 @@ rc = block_init(devmap_handle, BS_SIZE); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -978,5 +977,5 @@ if (rc != EOK) { block_fini(devmap_handle); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -987,5 +986,5 @@ if (BPS(bs) != BS_SIZE) { block_fini(devmap_handle); - ipc_answer_0(rid, ENOTSUP); + async_answer_0(rid, ENOTSUP); return; } @@ -995,5 +994,5 @@ if (rc != EOK) { block_fini(devmap_handle); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1004,5 +1003,5 @@ (void) block_cache_fini(devmap_handle); block_fini(devmap_handle); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1012,5 +1011,5 @@ (void) block_cache_fini(devmap_handle); block_fini(devmap_handle); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1022,5 +1021,5 @@ block_fini(devmap_handle); fat_idx_fini_by_devmap_handle(devmap_handle); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -1032,5 +1031,5 @@ block_fini(devmap_handle); fat_idx_fini_by_devmap_handle(devmap_handle); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -1044,5 +1043,5 @@ block_fini(devmap_handle); fat_idx_fini_by_devmap_handle(devmap_handle); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -1062,5 +1061,5 @@ fibril_mutex_unlock(&ridxp->lock); - ipc_answer_3(rid, EOK, ridxp->index, rootp->size, rootp->lnkcnt); + async_answer_3(rid, EOK, ridxp->index, rootp->size, rootp->lnkcnt); } @@ -1079,5 +1078,5 @@ rc = fat_root_get(&fn, devmap_handle); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1090,5 +1089,5 @@ if (nodep->refcnt != 2) { (void) fat_node_put(fn); - ipc_answer_0(rid, EBUSY); + async_answer_0(rid, EBUSY); return; } @@ -1110,5 +1109,5 @@ block_fini(devmap_handle); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -1138,9 +1137,9 @@ rc = fat_node_get(&fn, devmap_handle, index); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } if (!fn) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1151,6 +1150,6 @@ if (!async_data_read_receive(&callid, &len)) { fat_node_put(fn); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -1175,6 +1174,6 @@ if (rc != EOK) { fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1184,5 +1183,5 @@ if (rc != EOK) { fat_node_put(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1241,12 +1240,12 @@ miss: rc = fat_node_put(fn); - ipc_answer_0(callid, rc != EOK ? rc : ENOENT); - ipc_answer_1(rid, rc != EOK ? rc : ENOENT, 0); + async_answer_0(callid, rc != EOK ? rc : ENOENT); + async_answer_1(rid, rc != EOK ? rc : ENOENT, 0); return; err: (void) fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; @@ -1257,5 +1256,5 @@ rc = fat_node_put(fn); - ipc_answer_1(rid, rc, (sysarg_t)bytes); + async_answer_1(rid, rc, (sysarg_t)bytes); } @@ -1277,9 +1276,9 @@ rc = fat_node_get(&fn, devmap_handle, index); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } if (!fn) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1290,6 +1289,6 @@ if (!async_data_write_receive(&callid, &len)) { (void) fat_node_put(fn); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -1319,6 +1318,6 @@ if (rc != EOK) { (void) fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1326,6 +1325,6 @@ if (rc != EOK) { (void) fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1336,5 +1335,5 @@ if (rc != EOK) { (void) fat_node_put(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1345,5 +1344,5 @@ size = nodep->size; rc = fat_node_put(fn); - ipc_answer_2(rid, rc, bytes, nodep->size); + async_answer_2(rid, rc, bytes, nodep->size); return; } else { @@ -1361,6 +1360,6 @@ /* could not allocate a chain of nclsts clusters */ (void) fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1370,6 +1369,6 @@ (void) fat_free_clusters(bs, devmap_handle, mcl); (void) fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1379,6 +1378,6 @@ (void) fat_free_clusters(bs, devmap_handle, mcl); (void) fat_node_put(fn); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1390,5 +1389,5 @@ (void) fat_free_clusters(bs, devmap_handle, mcl); (void) fat_node_put(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1401,5 +1400,5 @@ (void) fat_free_clusters(bs, devmap_handle, mcl); (void) fat_node_put(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1407,5 +1406,5 @@ nodep->dirty = true; /* need to sync node */ rc = fat_node_put(fn); - ipc_answer_2(rid, rc, bytes, size); + async_answer_2(rid, rc, bytes, size); return; } @@ -1425,9 +1424,9 @@ rc = fat_node_get(&fn, devmap_handle, index); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } if (!fn) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1475,5 +1474,5 @@ out: fat_node_put(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1481,5 +1480,5 @@ void fat_close(ipc_callid_t rid, ipc_call_t *request) { - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -1493,14 +1492,14 @@ rc = fat_node_get(&fn, devmap_handle, index); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } if (!fn) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } rc = fat_destroy_node(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -1523,9 +1522,9 @@ int rc = fat_node_get(&fn, devmap_handle, index); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } if (!fn) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1537,5 +1536,5 @@ fat_node_put(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } Index: uspace/srv/fs/tmpfs/tmpfs.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/tmpfs/tmpfs.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -42,5 +42,4 @@ #include "tmpfs.h" -#include #include #include @@ -91,5 +90,5 @@ * created by IPC_M_CONNECT_TO_ME. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); } @@ -143,5 +142,5 @@ break; default: - ipc_answer_0(callid, ENOTSUP); + async_answer_0(callid, ENOTSUP); break; } Index: uspace/srv/fs/tmpfs/tmpfs.h =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/tmpfs/tmpfs.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,4 @@ #define TMPFS_TMPFS_H_ -#include #include #include Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ #include "tmpfs.h" #include "../../vfs/vfs.h" -#include #include #include @@ -450,5 +449,5 @@ rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -459,5 +458,5 @@ (void) tmpfs_node_put(rootfn); free(opts); - ipc_answer_0(rid, EEXIST); + async_answer_0(rid, EEXIST); return; } @@ -466,5 +465,5 @@ if (!tmpfs_instance_init(devmap_handle)) { free(opts); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -475,10 +474,10 @@ if (str_cmp(opts, "restore") == 0) { if (tmpfs_restore(devmap_handle)) - ipc_answer_3(rid, EOK, rootp->index, rootp->size, + async_answer_3(rid, EOK, rootp->index, rootp->size, rootp->lnkcnt); else - ipc_answer_0(rid, ELIMIT); + async_answer_0(rid, ELIMIT); } else { - ipc_answer_3(rid, EOK, rootp->index, rootp->size, + async_answer_3(rid, EOK, rootp->index, rootp->size, rootp->lnkcnt); } @@ -496,5 +495,5 @@ tmpfs_instance_done(devmap_handle); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -526,5 +525,5 @@ hlp = hash_table_find(&nodes, key); if (!hlp) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -538,6 +537,6 @@ size_t size; if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -566,6 +565,6 @@ if (lnk == &nodep->cs_head) { - ipc_answer_0(callid, ENOENT); - ipc_answer_1(rid, ENOENT, 0); + async_answer_0(callid, ENOENT); + async_answer_1(rid, ENOENT, 0); return; } @@ -581,5 +580,5 @@ * Answer the VFS_READ call. */ - ipc_answer_1(rid, EOK, bytes); + async_answer_1(rid, EOK, bytes); } @@ -601,5 +600,5 @@ hlp = hash_table_find(&nodes, key); if (!hlp) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -613,6 +612,6 @@ size_t size; if (!async_data_write_receive(&callid, &size)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -624,5 +623,5 @@ /* The file size is not changing. */ (void) async_data_write_finalize(callid, nodep->data + pos, size); - ipc_answer_2(rid, EOK, size, nodep->size); + async_answer_2(rid, EOK, size, nodep->size); return; } @@ -637,6 +636,6 @@ void *newdata = realloc(nodep->data, nodep->size + delta); if (!newdata) { - ipc_answer_0(callid, ENOMEM); - ipc_answer_2(rid, EOK, 0, nodep->size); + async_answer_0(callid, ENOMEM); + async_answer_2(rid, EOK, 0, nodep->size); return; } @@ -646,5 +645,5 @@ nodep->data = newdata; (void) async_data_write_finalize(callid, nodep->data + pos, size); - ipc_answer_2(rid, EOK, size, nodep->size); + async_answer_2(rid, EOK, size, nodep->size); } @@ -665,5 +664,5 @@ link_t *hlp = hash_table_find(&nodes, key); if (!hlp) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -672,10 +671,10 @@ if (size == nodep->size) { - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return; } if (size > SIZE_MAX) { - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -683,5 +682,5 @@ void *newdata = realloc(nodep->data, size); if (!newdata) { - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -694,10 +693,10 @@ nodep->size = size; nodep->data = newdata; - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } void tmpfs_close(ipc_callid_t rid, ipc_call_t *request) { - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -715,5 +714,5 @@ hlp = hash_table_find(&nodes, key); if (!hlp) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -721,5 +720,5 @@ nh_link); rc = tmpfs_destroy_node(FS_NODE(nodep)); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -740,5 +739,5 @@ * thus the sync operation is a no-op. */ - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } Index: uspace/srv/hid/adb_mouse/adb_dev.c =================================================================== --- uspace/srv/hid/adb_mouse/adb_dev.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/adb_mouse/adb_dev.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,4 @@ */ -#include #include #include @@ -68,13 +67,9 @@ /* NB: The callback connection is slotted for removal */ - sysarg_t taskhash; - sysarg_t phonehash; - if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) { + if (async_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) { printf(NAME ": Failed to create callback from device\n"); return false; } - - async_new_connection(taskhash, phonehash, 0, NULL, adb_dev_events); - + return 0; } @@ -100,5 +95,5 @@ retval = ENOENT; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/adb_mouse/adb_mouse.c =================================================================== --- uspace/srv/hid/adb_mouse/adb_mouse.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/adb_mouse/adb_mouse.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ */ -#include #include #include @@ -98,5 +97,5 @@ int retval; - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -105,9 +104,9 @@ case IPC_M_PHONE_HUNGUP: if (client_phone != -1) { - ipc_hangup(client_phone); + async_hangup(client_phone); client_phone = -1; } - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case IPC_M_CONNECT_TO_ME: @@ -122,5 +121,5 @@ retval = EINVAL; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/char_mouse/char_mouse.c =================================================================== --- uspace/srv/hid/char_mouse/char_mouse.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/char_mouse/char_mouse.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ */ -#include #include #include @@ -83,5 +82,5 @@ int retval; - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -90,9 +89,9 @@ case IPC_M_PHONE_HUNGUP: if (client_phone != -1) { - ipc_hangup(client_phone); + async_hangup(client_phone); client_phone = -1; } - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case IPC_M_CONNECT_TO_ME: @@ -107,5 +106,5 @@ retval = EINVAL; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/char_mouse/chardev.c =================================================================== --- uspace/srv/hid/char_mouse/chardev.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/char_mouse/chardev.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,4 @@ */ -#include #include #include @@ -70,12 +69,8 @@ /* NB: The callback connection is slotted for removal */ - sysarg_t taskhash; - sysarg_t phonehash; - if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) { + if (async_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) { printf(NAME ": Failed to create callback from device\n"); return false; } - - async_new_connection(taskhash, phonehash, 0, NULL, chardev_events); return 0; @@ -115,5 +110,5 @@ retval = ENOENT; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/console/console.c =================================================================== --- uspace/srv/hid/console/console.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/console/console.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,4 @@ #include -#include #include #include @@ -117,5 +116,5 @@ static void curs_hide_sync(void) { - ipc_call_sync_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false); + async_req_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false); } @@ -132,20 +131,20 @@ static void screen_yield(void) { - ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_YIELD); + async_req_0_0(fb_info.phone, FB_SCREEN_YIELD); } static void screen_reclaim(void) { - ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_RECLAIM); + async_req_0_0(fb_info.phone, FB_SCREEN_RECLAIM); } static void kbd_yield(void) { - ipc_call_sync_0_0(kbd_phone, KBD_YIELD); + async_req_0_0(kbd_phone, KBD_YIELD); } static void kbd_reclaim(void) { - ipc_call_sync_0_0(kbd_phone, KBD_RECLAIM); + async_req_0_0(kbd_phone, KBD_RECLAIM); } @@ -438,5 +437,5 @@ retval = ENOENT; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } @@ -473,5 +472,5 @@ } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } @@ -484,5 +483,5 @@ if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -499,5 +498,5 @@ gcons_notify_char(cons->index); - ipc_answer_1(rid, EOK, size); + async_answer_1(rid, EOK, size); free(buf); @@ -509,6 +508,6 @@ size_t size; if (!async_data_read_receive(&callid, &size)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -516,6 +515,6 @@ char *buf = (char *) malloc(size); if (buf == NULL) { - ipc_answer_0(callid, ENOMEM); - ipc_answer_0(rid, ENOMEM); + async_answer_0(callid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -535,5 +534,5 @@ if (pos == size) { (void) async_data_read_finalize(callid, buf, size); - ipc_answer_1(rid, EOK, size); + async_answer_1(rid, EOK, size); free(buf); } else { @@ -553,5 +552,5 @@ recheck: if (keybuffer_pop(&cons->keybuffer, &ev)) { - ipc_answer_4(rid, EOK, ev.type, ev.key, ev.mods, ev.c); + async_answer_4(rid, EOK, ev.type, ev.key, ev.mods, ev.c); } else { fibril_condvar_wait(&input_cv, &input_mutex); @@ -579,5 +578,5 @@ if (cons == NULL) { - ipc_answer_0(iid, ENOENT); + async_answer_0(iid, ENOENT); return; } @@ -598,5 +597,5 @@ /* Accept the connection */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { @@ -658,5 +657,5 @@ rc = ccap_fb_to_con(fb_info.color_cap, &arg1); if (rc != EOK) { - ipc_answer_0(callid, rc); + async_answer_0(callid, rc); continue; } @@ -702,5 +701,5 @@ break; } - ipc_answer_3(callid, EOK, arg1, arg2, arg3); + async_answer_3(callid, EOK, arg1, arg2, arg3); } } @@ -727,13 +726,9 @@ /* NB: The callback connection is slotted for removal */ - sysarg_t taskhash; - sysarg_t phonehash; - if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &taskhash, - &phonehash) != 0) { + if (async_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, keyboard_events) + != 0) { printf(NAME ": Failed to create callback from input device\n"); return false; } - - async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events); /* Connect to mouse device */ @@ -752,6 +747,6 @@ } - if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &taskhash, - &phonehash) != 0) { + if (async_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, mouse_events) + != 0) { printf(NAME ": Failed to create callback from mouse device\n"); mouse_phone = -1; @@ -759,5 +754,4 @@ } - async_new_connection(taskhash, phonehash, 0, NULL, mouse_events); skip_mouse: Index: uspace/srv/hid/console/gcons.c =================================================================== --- uspace/srv/hid/console/gcons.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/console/gcons.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,4 @@ #include -#include #include #include Index: uspace/srv/hid/fb/ega.c =================================================================== --- uspace/srv/hid/fb/ega.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/fb/ega.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -46,5 +45,4 @@ #include #include -#include #include #include @@ -262,5 +260,5 @@ if (client_connected) { - ipc_answer_0(iid, ELIMIT); + async_answer_0(iid, ELIMIT); return; } @@ -268,5 +266,5 @@ /* Accept connection */ client_connected = 1; - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { @@ -296,5 +294,5 @@ case IPC_M_PHONE_HUNGUP: client_connected = 0; - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); /* Exit thread */ @@ -332,8 +330,8 @@ break; case FB_GET_CSIZE: - ipc_answer_2(callid, EOK, scr_width, scr_height); + async_answer_2(callid, EOK, scr_width, scr_height); continue; case FB_GET_COLOR_CAP: - ipc_answer_1(callid, EOK, FB_CCAP_INDEXED); + async_answer_1(callid, EOK, FB_CCAP_INDEXED); continue; case FB_CLEAR: @@ -440,5 +438,5 @@ retval = EINVAL; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/fb/fb.c =================================================================== --- uspace/srv/hid/fb/fb.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/fb/fb.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -47,5 +47,4 @@ #include #include -#include #include #include @@ -1089,5 +1088,5 @@ void *dest = as_get_mappable_page(IPC_GET_ARG2(*call)); shm_size = IPC_GET_ARG2(*call); - if (ipc_answer_1(callid, EOK, (sysarg_t) dest)) { + if (async_answer_1(callid, EOK, (sysarg_t) dest)) { shm_id = 0; return false; @@ -1166,5 +1165,5 @@ if (handled) - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); return handled; } @@ -1445,5 +1444,5 @@ } if (handled) - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); return handled; } @@ -1498,5 +1497,5 @@ if (handled) - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); return handled; @@ -1582,5 +1581,5 @@ if (client_connected) { - ipc_answer_0(iid, ELIMIT); + async_answer_0(iid, ELIMIT); return; } @@ -1588,5 +1587,5 @@ /* Accept connection */ client_connected = true; - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { @@ -1641,5 +1640,5 @@ break; } - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); draw_char(vport, ch, col, row); @@ -1674,8 +1673,8 @@ break; case FB_GET_CSIZE: - ipc_answer_2(callid, EOK, vport->cols, vport->rows); + async_answer_2(callid, EOK, vport->cols, vport->rows); continue; case FB_GET_COLOR_CAP: - ipc_answer_1(callid, EOK, FB_CCAP_RGB); + async_answer_1(callid, EOK, FB_CCAP_RGB); continue; case FB_SCROLL: @@ -1742,5 +1741,5 @@ break; case FB_GET_RESOLUTION: - ipc_answer_2(callid, EOK, screen.xres, screen.yres); + async_answer_2(callid, EOK, screen.xres, screen.yres); continue; case FB_POINTER_MOVE: @@ -1756,5 +1755,5 @@ retval = ENOENT; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/fb/main.c =================================================================== --- uspace/srv/hid/fb/main.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/fb/main.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -27,5 +27,4 @@ */ -#include #include #include @@ -52,5 +51,5 @@ dest = as_get_mappable_page(IPC_GET_ARG2(*call)); - if (ipc_answer_1(callid, EOK, (sysarg_t) dest) == 0) { + if (async_answer_1(callid, EOK, (sysarg_t) dest) == 0) { if (*area) as_area_destroy(*area); Index: uspace/srv/hid/fb/serial_console.c =================================================================== --- uspace/srv/hid/fb/serial_console.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/fb/serial_console.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,4 @@ #include -#include #include #include Index: uspace/srv/hid/fb/serial_console.h =================================================================== --- uspace/srv/hid/fb/serial_console.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/fb/serial_console.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,5 +39,6 @@ #define FB_SERIAL_CONSOLE_H_ -#include +#include +#include typedef void (*putc_function_t)(char); Index: uspace/srv/hid/kbd/generic/kbd.c =================================================================== --- uspace/srv/hid/kbd/generic/kbd.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/generic/kbd.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ */ -#include #include #include @@ -173,5 +172,5 @@ int retval; - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -180,9 +179,9 @@ case IPC_M_PHONE_HUNGUP: if (client_phone != -1) { - ipc_hangup(client_phone); + async_hangup(client_phone); client_phone = -1; } - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case IPC_M_CONNECT_TO_ME: @@ -205,5 +204,5 @@ retval = EINVAL; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/kbd/port/adb.c =================================================================== --- uspace/srv/hid/kbd/port/adb.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/adb.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ */ -#include #include #include Index: uspace/srv/hid/kbd/port/chardev.c =================================================================== --- uspace/srv/hid/kbd/port/chardev.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/chardev.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ */ -#include #include #include @@ -91,12 +90,8 @@ /* NB: The callback connection is slotted for removal */ - sysarg_t taskhash; - sysarg_t phonehash; - if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) { + if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) { printf(NAME ": Failed to create callback from device\n"); return -1; } - - async_new_connection(taskhash, phonehash, 0, NULL, kbd_port_events); return 0; @@ -136,5 +131,5 @@ retval = ENOENT; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hid/kbd/port/gxemul.c =================================================================== --- uspace/srv/hid/kbd/port/gxemul.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/gxemul.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ */ -#include #include #include Index: uspace/srv/hid/kbd/port/msim.c =================================================================== --- uspace/srv/hid/kbd/port/msim.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/msim.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ */ -#include #include #include Index: uspace/srv/hid/kbd/port/ns16550.c =================================================================== --- uspace/srv/hid/kbd/port/ns16550.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/ns16550.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ */ -#include #include #include Index: uspace/srv/hid/kbd/port/pl050.c =================================================================== --- uspace/srv/hid/kbd/port/pl050.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/pl050.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -37,5 +37,4 @@ #include #include -#include #include #include Index: uspace/srv/hid/kbd/port/z8530.c =================================================================== --- uspace/srv/hid/kbd/port/z8530.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/kbd/port/z8530.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ */ -#include #include #include Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c =================================================================== --- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -42,5 +42,4 @@ #include #include -#include #include #include @@ -140,5 +139,5 @@ async_set_interrupt_received(s3c24xx_ts_irq_handler); - ipc_register_irq(inr, device_assign_devno(), 0, &ts_irq_code); + register_irq(inr, device_assign_devno(), 0, &ts_irq_code); s3c24xx_ts_wait_for_int_mode(ts, updn_down); @@ -377,5 +376,5 @@ int retval; - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -384,9 +383,9 @@ case IPC_M_PHONE_HUNGUP: if (ts->client_phone != -1) { - ipc_hangup(ts->client_phone); + async_hangup(ts->client_phone); ts->client_phone = -1; } - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case IPC_M_CONNECT_TO_ME: @@ -401,5 +400,5 @@ retval = EINVAL; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hw/char/i8042/i8042.c =================================================================== --- uspace/srv/hw/char/i8042/i8042.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/char/i8042/i8042.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -199,6 +198,6 @@ i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status; i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data; - ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd); - ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd); + register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd); + register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd); printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n", NAME, inr_a, inr_b); @@ -236,10 +235,10 @@ if (dev_id < 0) { - ipc_answer_0(iid, EINVAL); + async_answer_0(iid, EINVAL); return; } /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); printf(NAME ": accepted connection\n"); @@ -251,5 +250,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case IPC_M_CONNECT_TO_ME: @@ -272,5 +271,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -119,5 +118,5 @@ /* Answer the IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -127,5 +126,5 @@ case IPC_M_PHONE_HUNGUP: /* The other side has hung up. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); return; case IPC_M_CONNECT_TO_ME: @@ -144,5 +143,5 @@ break; } - ipc_answer_0(callid, retval); + async_answer_0(callid, retval); } } @@ -191,5 +190,5 @@ async_set_interrupt_received(s3c24xx_uart_irq_handler); - ipc_register_irq(inr, device_assign_devno(), 0, &uart_irq_code); + register_irq(inr, device_assign_devno(), 0, &uart_irq_code); /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */ Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/irc/apic/apic.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ */ -#include #include #include @@ -75,5 +74,5 @@ * Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { @@ -82,12 +81,12 @@ switch (IPC_GET_IMETHOD(call)) { case IRC_ENABLE_INTERRUPT: - ipc_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call))); + async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call))); break; case IRC_CLEAR_INTERRUPT: /* Noop */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; default: - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); break; } Index: uspace/srv/hw/irc/fhc/fhc.c =================================================================== --- uspace/srv/hw/irc/fhc/fhc.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/irc/fhc/fhc.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -29,12 +29,11 @@ /** @addtogroup fhc * @{ - */ + */ /** - * @file fhc.c - * @brief FHC bus controller driver. + * @file fhc.c + * @brief FHC bus controller driver. */ -#include #include #include @@ -76,5 +75,5 @@ * Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -85,5 +84,5 @@ case IRC_ENABLE_INTERRUPT: /* Noop */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; case IRC_CLEAR_INTERRUPT: @@ -92,13 +91,13 @@ case FHC_UART_INR: fhc_uart_virt[FHC_UART_ICLR] = 0; - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; default: - ipc_answer_0(callid, ENOTSUP); + async_answer_0(callid, ENOTSUP); break; } break; default: - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); break; } Index: uspace/srv/hw/irc/i8259/i8259.c =================================================================== --- uspace/srv/hw/irc/i8259/i8259.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/irc/i8259/i8259.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ */ -#include #include #include @@ -109,5 +108,5 @@ * Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { @@ -116,12 +115,12 @@ switch (IPC_GET_IMETHOD(call)) { case IRC_ENABLE_INTERRUPT: - ipc_answer_0(callid, pic_enable_irq(IPC_GET_ARG1(call))); + async_answer_0(callid, pic_enable_irq(IPC_GET_ARG1(call))); break; case IRC_CLEAR_INTERRUPT: /* Noop */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; default: - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); break; } Index: uspace/srv/hw/irc/obio/obio.c =================================================================== --- uspace/srv/hw/irc/obio/obio.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/irc/obio/obio.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -27,11 +27,11 @@ */ -/** @addtogroup obio +/** @addtogroup obio * @{ - */ + */ /** - * @file obio.c - * @brief OBIO driver. + * @file obio.c + * @brief OBIO driver. * * OBIO is a short for on-board I/O. On UltraSPARC IIi and systems with U2P, @@ -42,5 +42,4 @@ */ -#include #include #include @@ -86,5 +85,5 @@ * Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (1) { @@ -95,13 +94,13 @@ case IRC_ENABLE_INTERRUPT: /* Noop */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; case IRC_CLEAR_INTERRUPT: inr = IPC_GET_ARG1(call); base_virt[OBIO_CIR(inr & INO_MASK)] = 0; - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); break; default: - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); break; } Index: uspace/srv/hw/netif/ne2000/ne2000.c =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/hw/netif/ne2000/ne2000.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -43,5 +43,4 @@ #include #include -#include #include #include @@ -317,5 +316,5 @@ ne2k_cmds[5].addr = ne2k->port + DP_TSR; - int rc = ipc_register_irq(ne2k->irq, device->device_id, + int rc = register_irq(ne2k->irq, device->device_id, device->device_id, &ne2k_code); if (rc != EOK) @@ -324,5 +323,5 @@ rc = ne2k_up(ne2k); if (rc != EOK) { - ipc_unregister_irq(ne2k->irq, device->device_id); + unregister_irq(ne2k->irq, device->device_id); return rc; } @@ -343,5 +342,5 @@ ne2k_down(ne2k); - ipc_unregister_irq(ne2k->irq, device->device_id); + unregister_irq(ne2k->irq, device->device_id); change_state(device, NETIF_STOPPED); } @@ -396,5 +395,5 @@ async_set_interrupt_received(irq_handler); - return ipc_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL, NULL); + return async_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL); } Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/loader/main.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -50,5 +50,4 @@ #include #include -#include #include #include @@ -106,6 +105,6 @@ if (!async_data_read_receive(&callid, &len)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -115,5 +114,5 @@ async_data_read_finalize(callid, &task_id, len); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -135,5 +134,5 @@ } - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -155,5 +154,5 @@ } - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -188,5 +187,5 @@ if (_argv == NULL) { free(buf); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -220,5 +219,5 @@ } - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -244,5 +243,5 @@ if (_filv == NULL) { free(buf); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -271,5 +270,5 @@ } - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -287,5 +286,5 @@ if (rc != EE_OK) { DPRINTF("Failed to load executable '%s'.\n", pathname); - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); return 1; } @@ -304,5 +303,5 @@ /* Statically linked program */ is_dyn_linked = false; - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return 0; } @@ -312,10 +311,10 @@ DPRINTF("Failed to load interpreter '%s.'\n", prog_info.interp); - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); return 1; } is_dyn_linked = true; - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); return 0; @@ -343,9 +342,9 @@ DPRINTF("Entry point: %p\n", interp_info.entry); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); elf_run(&interp_info, &pcb); } else { /* Statically linked program */ - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); elf_run(&prog_info, &pcb); } @@ -367,5 +366,5 @@ /* Already have a connection? */ if (connected) { - ipc_answer_0(iid, ELIMIT); + async_answer_0(iid, ELIMIT); return; } @@ -374,5 +373,5 @@ /* Accept the connection */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); /* Ignore parameters, the connection is already open */ @@ -414,5 +413,5 @@ DPRINTF("Responding EINVAL to method %d.\n", IPC_GET_IMETHOD(call)); - ipc_answer_0(callid, EINVAL); + async_answer_0(callid, EINVAL); } } Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/il/arp/arp.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -45,5 +45,4 @@ #include #include -#include #include #include @@ -428,5 +427,5 @@ case NET_IL_DEVICE_STATE: /* Do nothing - keep the cache */ - ipc_answer_0(iid, (sysarg_t) EOK); + async_answer_0(iid, (sysarg_t) EOK); break; @@ -448,5 +447,5 @@ fibril_mutex_unlock(&arp_globals.lock); } - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; @@ -454,9 +453,9 @@ rc = arp_mtu_changed_message(IPC_GET_DEVICE(*icall), IPC_GET_MTU(*icall)); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } Index: uspace/srv/net/il/arp/arp.h =================================================================== --- uspace/srv/net/il/arp/arp.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/il/arp/arp.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,8 +39,5 @@ #include - -#include #include - #include #include Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/il/ip/ip.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -41,5 +41,4 @@ #include #include -#include #include #include @@ -1596,5 +1595,5 @@ rc = ip_device_state_message(IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall)); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; @@ -1610,5 +1609,5 @@ } - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; @@ -1616,9 +1615,9 @@ rc = ip_mtu_changed_message(IPC_GET_DEVICE(*icall), IPC_GET_MTU(*icall)); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } Index: uspace/srv/net/il/ip/ip.h =================================================================== --- uspace/srv/net/il/ip/ip.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/il/ip/ip.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,7 +39,5 @@ #include -#include #include - #include #include Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/net/net.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -47,5 +47,4 @@ #include -#include #include #include @@ -337,5 +336,5 @@ goto out; - rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL, NULL); + rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL); if (rc != EOK) goto out; @@ -686,5 +685,5 @@ * - Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (true) { Index: uspace/srv/net/net/net.h =================================================================== --- uspace/srv/net/net/net.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/net/net.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -38,6 +38,4 @@ #ifndef NET_NET_H_ #define NET_NET_H_ - -#include #include Index: uspace/srv/net/net/net_standalone.c =================================================================== --- uspace/srv/net/net/net_standalone.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/net/net_standalone.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -40,5 +40,4 @@ #include #include -#include #include #include Index: uspace/srv/net/netif/lo/lo.c =================================================================== --- uspace/srv/net/netif/lo/lo.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/netif/lo/lo.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -39,9 +39,6 @@ #include #include - -#include #include #include - #include #include @@ -167,5 +164,5 @@ int netif_initialize(void) { - return ipc_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, NULL, NULL); + return async_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, NULL); } Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/nil/eth/eth.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -43,10 +43,7 @@ #include #include - -#include #include #include #include - #include #include @@ -242,5 +239,5 @@ nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall)); - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); break; case NET_NIL_RECEIVED: @@ -251,8 +248,8 @@ IPC_GET_DEVICE(*icall), packet, 0); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } Index: uspace/srv/net/nil/nildummy/nildummy.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/nil/nildummy/nildummy.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -41,5 +41,4 @@ #include #include -#include #include #include @@ -112,5 +111,5 @@ rc = nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall)); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; @@ -122,9 +121,9 @@ IPC_GET_DEVICE(*icall), packet, 0); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } Index: uspace/srv/net/tl/icmp/icmp.c =================================================================== --- uspace/srv/net/tl/icmp/icmp.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/tl/icmp/icmp.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -41,5 +41,4 @@ #include #include -#include #include #include @@ -628,5 +627,5 @@ } - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; case IPC_M_PHONE_HUNGUP: @@ -634,5 +633,5 @@ continue; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/tl/tcp/tcp.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -44,5 +44,4 @@ #include -#include #include #include @@ -1506,5 +1505,5 @@ /* Release the application phone */ - ipc_hangup(app_phone); + async_hangup(app_phone); printf("release\n"); @@ -2454,8 +2453,8 @@ SERVICE_TCP, IPC_GET_ERROR(*icall)); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/net/tl/udp/udp.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -354,8 +353,8 @@ SERVICE_UDP, IPC_GET_ERROR(*icall)); - ipc_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, (sysarg_t) rc); break; default: - ipc_answer_0(iid, (sysarg_t) ENOTSUP); + async_answer_0(iid, (sysarg_t) ENOTSUP); } @@ -868,5 +867,5 @@ /* Release the application phone */ - ipc_hangup(app_phone); + async_hangup(app_phone); /* Release all local sockets */ Index: uspace/srv/ns/clonable.h =================================================================== --- uspace/srv/ns/clonable.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/ns/clonable.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,14 +34,13 @@ #define NS_CLONABLE_H__ -#include +#include +#include #include extern int clonable_init(void); -extern bool service_clonable(int service); -extern void register_clonable(sysarg_t service, sysarg_t phone, - ipc_call_t *call, ipc_callid_t callid); -extern void connect_to_clonable(sysarg_t service, ipc_call_t *call, - ipc_callid_t callid); +extern bool service_clonable(int); +extern void register_clonable(sysarg_t, sysarg_t, ipc_call_t *, ipc_callid_t); +extern void connect_to_clonable(sysarg_t, ipc_call_t *, ipc_callid_t); #endif Index: uspace/srv/ns/service.h =================================================================== --- uspace/srv/ns/service.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/ns/service.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,12 +34,12 @@ #define NS_SERVICE_H__ -#include +#include +#include extern int service_init(void); extern void process_pending_conn(void); -extern int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call); -extern void connect_to_service(sysarg_t service, ipc_call_t *call, - ipc_callid_t callid); +extern int register_service(sysarg_t, sysarg_t, ipc_call_t *); +extern void connect_to_service(sysarg_t, ipc_call_t *, ipc_callid_t); #endif Index: uspace/srv/ns/task.h =================================================================== --- uspace/srv/ns/task.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/ns/task.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -34,5 +34,5 @@ #define NS_TASK_H__ -#include +#include extern int task_init(void); Index: uspace/srv/taskmon/taskmon.c =================================================================== --- uspace/srv/taskmon/taskmon.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/taskmon/taskmon.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ #include -#include #include #include Index: uspace/srv/vfs/vfs.c =================================================================== --- uspace/srv/vfs/vfs.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/vfs/vfs.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ */ -#include #include #include @@ -58,5 +57,5 @@ * This call needs to be answered. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); while (keep_on_going) { @@ -120,5 +119,5 @@ vfs_dup(callid, &call); default: - ipc_answer_0(callid, ENOTSUP); + async_answer_0(callid, ENOTSUP); break; } Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/vfs/vfs.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -35,5 +35,4 @@ #include -#include #include #include Index: uspace/srv/vfs/vfs_lookup.c =================================================================== --- uspace/srv/vfs/vfs_lookup.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/vfs/vfs_lookup.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -37,5 +37,4 @@ #include "vfs.h" -#include #include #include Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/vfs/vfs_ops.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -37,5 +37,4 @@ #include "vfs.h" -#include #include #include @@ -91,5 +90,5 @@ /* Trying to mount root FS over root FS */ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, EBUSY); + async_answer_0(rid, EBUSY); return; } @@ -99,5 +98,5 @@ /* The lookup failed for some reason. */ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -106,5 +105,5 @@ if (!mp_node) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -134,5 +133,5 @@ vfs_release_phone(fs_handle, phone); fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -142,5 +141,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -165,5 +164,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } else { @@ -173,5 +172,5 @@ */ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -202,5 +201,5 @@ if (mp_node) vfs_node_put(mp_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); fibril_rwlock_write_unlock(&namespace_rwlock); return; @@ -218,5 +217,5 @@ vfs_node_put(mp_node); fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -245,5 +244,5 @@ } - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); fibril_rwlock_write_unlock(&namespace_rwlock); } @@ -275,5 +274,5 @@ 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -285,5 +284,5 @@ if (rc != EOK) { free(mp); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -299,5 +298,5 @@ free(mp); free(opts); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -310,6 +309,6 @@ ipc_callid_t callid = async_get_call(&data); if (IPC_GET_IMETHOD(data) != IPC_M_PING) { - ipc_answer_0(callid, ENOTSUP); - ipc_answer_0(rid, ENOTSUP); + async_answer_0(callid, ENOTSUP); + async_answer_0(rid, ENOTSUP); free(mp); free(opts); @@ -333,6 +332,6 @@ fibril_mutex_unlock(&fs_head_lock); - ipc_answer_0(callid, ENOENT); - ipc_answer_0(rid, ENOENT); + async_answer_0(callid, ENOENT); + async_answer_0(rid, ENOENT); free(mp); free(fs_name); @@ -343,5 +342,5 @@ /* Acknowledge that we know fs_name. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); /* Do the mount */ @@ -367,5 +366,5 @@ 0, NULL); if (rc != EOK) - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); /* @@ -386,5 +385,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); free(mp); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -393,5 +392,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); free(mp); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -409,5 +408,5 @@ vfs_node_put(mr_node); free(mp); - ipc_answer_0(rid, EBUSY); + async_answer_0(rid, EBUSY); return; } @@ -430,5 +429,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -449,5 +448,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -456,5 +455,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -468,5 +467,5 @@ vfs_node_put(mp_node); vfs_node_put(mr_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -486,5 +485,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -514,5 +513,5 @@ ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) || (lflag & (L_OPEN | L_ROOT | L_MP))) { - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -526,5 +525,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -548,5 +547,5 @@ else fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(path); return; @@ -571,5 +570,5 @@ fibril_rwlock_write_unlock(&node->contents_rwlock); vfs_node_put(node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -586,5 +585,5 @@ if (fd < 0) { vfs_node_put(node); - ipc_answer_0(rid, fd); + async_answer_0(rid, fd); return; } @@ -607,5 +606,5 @@ /* Success! Return the new file descriptor to the client. */ - ipc_answer_1(rid, EOK, fd); + async_answer_1(rid, EOK, fd); } @@ -629,5 +628,5 @@ if (rc != EOK) { fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -645,5 +644,5 @@ fibril_rwlock_write_unlock(&node->contents_rwlock); vfs_node_put(node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -660,5 +659,5 @@ if (fd < 0) { vfs_node_put(node); - ipc_answer_0(rid, fd); + async_answer_0(rid, fd); return; } @@ -680,5 +679,5 @@ /* Success! Return the new file descriptor to the client. */ - ipc_answer_1(rid, EOK, fd); + async_answer_1(rid, EOK, fd); } @@ -690,5 +689,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -715,5 +714,5 @@ vfs_file_put(file); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -760,5 +759,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -766,9 +765,9 @@ int ret = vfs_close_internal(file); if (ret != EOK) - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); vfs_file_put(file); ret = vfs_fd_free(fd); - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); } @@ -792,5 +791,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -875,5 +874,5 @@ * return to the client. */ - ipc_answer_1(rid, rc, bytes); + async_answer_1(rid, rc, bytes); } @@ -898,5 +897,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -911,5 +910,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_1(rid, EOK, off); + async_answer_1(rid, EOK, off); return; } @@ -919,5 +918,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -926,5 +925,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -935,5 +934,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_2(rid, EOK, LOWER32(newoff), + async_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff)); return; @@ -946,5 +945,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -954,5 +953,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -964,5 +963,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff)); + async_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff)); return; } @@ -970,5 +969,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); } @@ -995,5 +994,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1009,5 +1008,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, (sysarg_t)rc); + async_answer_0(rid, (sysarg_t)rc); } @@ -1019,5 +1018,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1026,6 +1025,6 @@ if (!async_data_read_receive(&callid, NULL)) { vfs_file_put(file); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -1038,5 +1037,5 @@ msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle, file->node->index, true, NULL); - ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); async_wait_for(msg, &rc); vfs_release_phone(file->node->fs_handle, fs_phone); @@ -1044,5 +1043,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -1052,5 +1051,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1059,6 +1058,6 @@ if (!async_data_read_receive(&callid, NULL)) { free(path); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -1070,6 +1069,6 @@ if (rc != EOK) { fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1077,6 +1076,6 @@ if (!node) { fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(callid, ENOMEM); - ipc_answer_0(rid, ENOMEM); + async_answer_0(callid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -1088,5 +1087,5 @@ msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle, node->index, false, NULL); - ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); sysarg_t rv; @@ -1094,5 +1093,5 @@ vfs_release_phone(node->fs_handle, fs_phone); - ipc_answer_0(rid, rv); + async_answer_0(rid, rv); vfs_node_put(node); @@ -1106,5 +1105,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1118,5 +1117,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); free(path); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -1128,5 +1127,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1139,5 +1138,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1154,5 +1153,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(node); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -1163,5 +1162,5 @@ int rc = async_data_write_accept((void **) &old, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1172,5 +1171,5 @@ if (rc != EOK) { free(old); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1182,5 +1181,5 @@ if ((!oldc) || (!newc)) { - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); free(old); free(new); @@ -1201,5 +1200,5 @@ * - oldc and newc are equal. */ - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); free(old); free(new); @@ -1216,5 +1215,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1225,5 +1224,5 @@ if (!old_node) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); free(old); free(new); @@ -1235,5 +1234,5 @@ if (!parentc) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1252,5 +1251,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1262,5 +1261,5 @@ (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, EXDEV); /* different file systems */ + async_answer_0(rid, EXDEV); /* different file systems */ free(old); free(new); @@ -1280,5 +1279,5 @@ if (!new_node) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); free(old); free(new); @@ -1291,5 +1290,5 @@ default: fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOTEMPTY); + async_answer_0(rid, ENOTEMPTY); free(old); free(new); @@ -1303,5 +1302,5 @@ if (new_node) vfs_node_put(new_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1320,5 +1319,5 @@ if (new_node) vfs_node_put(new_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1337,5 +1336,5 @@ free(old); free(new); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -1347,5 +1346,5 @@ /* If the file descriptors are the same, do nothing. */ if (oldfd == newfd) { - ipc_answer_1(rid, EOK, newfd); + async_answer_1(rid, EOK, newfd); return; } @@ -1354,5 +1353,5 @@ vfs_file_t *oldfile = vfs_file_get(oldfd); if (!oldfile) { - ipc_answer_0(rid, EBADF); + async_answer_0(rid, EBADF); return; } @@ -1373,5 +1372,5 @@ vfs_file_put(oldfile); vfs_file_put(newfile); - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); return; } @@ -1382,5 +1381,5 @@ vfs_file_put(oldfile); vfs_file_put(newfile); - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); return; } @@ -1394,7 +1393,7 @@ if (ret != EOK) - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); else - ipc_answer_1(rid, EOK, newfd); + async_answer_1(rid, EOK, newfd); } Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 007e6efa14f9116036c5ff0b040b3fbedee25b6f) +++ uspace/srv/vfs/vfs_register.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) @@ -36,5 +36,4 @@ */ -#include #include #include @@ -122,5 +121,5 @@ dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n", rc); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -132,5 +131,5 @@ if (!fs_info) { dprintf("Could not allocate memory for FS info.\n"); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -144,5 +143,5 @@ if (!vfs_info_sane(&fs_info->vfs_info)) { free(fs_info); - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -160,5 +159,5 @@ fibril_mutex_unlock(&fs_head_lock); free(fs_info); - ipc_answer_0(rid, EEXISTS); + async_answer_0(rid, EEXISTS); return; } @@ -182,6 +181,6 @@ fibril_mutex_unlock(&fs_head_lock); free(fs_info); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -189,5 +188,5 @@ phone = IPC_GET_ARG5(call); async_session_create(&fs_info->session, phone, 0); - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); dprintf("Callback connection to FS created.\n"); @@ -203,8 +202,8 @@ fibril_mutex_unlock(&fs_head_lock); async_session_destroy(&fs_info->session); - ipc_hangup(phone); - free(fs_info); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_hangup(phone); + free(fs_info); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -218,8 +217,8 @@ fibril_mutex_unlock(&fs_head_lock); async_session_destroy(&fs_info->session); - ipc_hangup(phone); - free(fs_info); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_hangup(phone); + free(fs_info); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -239,5 +238,5 @@ */ fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next); - ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle); + async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle); fibril_condvar_broadcast(&fs_head_cv);