Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision aa893e0c1c2438f546d8cc1d5ff8f9942998561c) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision bd813861801556b8db9bf68757dadd65653cf582) @@ -51,5 +51,4 @@ #include #include -#include #include #include @@ -282,5 +281,5 @@ sysarg_t method; devmap_handle_t dh; - int flags; + unsigned int flags; int retval; uint64_t ba; @@ -298,13 +297,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; } @@ -312,5 +311,5 @@ fs_va = as_get_mappable_page(comm_size); if (fs_va == NULL) { - ipc_answer_0(callid, EHANGUP); + async_answer_0(callid, EHANGUP); return; } @@ -324,5 +323,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: @@ -347,8 +346,8 @@ break; case BD_GET_BLOCK_SIZE: - ipc_answer_1(callid, EOK, disk[disk_id].block_size); + async_answer_1(callid, EOK, disk[disk_id].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; @@ -357,5 +356,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 aa893e0c1c2438f546d8cc1d5ff8f9942998561c) +++ uspace/srv/bd/file_bd/file_bd.c (revision bd813861801556b8db9bf68757dadd65653cf582) @@ -41,5 +41,4 @@ #include #include -#include #include #include @@ -178,5 +177,5 @@ sysarg_t method; size_t comm_size; - int flags; + unsigned int flags; int retval; uint64_t ba; @@ -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 aa893e0c1c2438f546d8cc1d5ff8f9942998561c) +++ uspace/srv/bd/gxe_bd/gxe_bd.c (revision bd813861801556b8db9bf68757dadd65653cf582) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -161,5 +160,5 @@ sysarg_t method; devmap_handle_t dh; - int flags; + unsigned int flags; int retval; uint64_t ba; @@ -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 aa893e0c1c2438f546d8cc1d5ff8f9942998561c) +++ uspace/srv/bd/part/guid_part/guid_part.c (revision bd813861801556b8db9bf68757dadd65653cf582) @@ -47,5 +47,4 @@ #include #include -#include #include #include @@ -316,5 +315,5 @@ sysarg_t method; devmap_handle_t dh; - int flags; + unsigned int flags; int retval; aoff64_t ba; @@ -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 aa893e0c1c2438f546d8cc1d5ff8f9942998561c) +++ uspace/srv/bd/part/mbr_part/mbr_part.c (revision bd813861801556b8db9bf68757dadd65653cf582) @@ -57,5 +57,4 @@ #include #include -#include #include #include @@ -394,5 +393,5 @@ sysarg_t method; devmap_handle_t dh; - int flags; + unsigned int flags; int retval; uint64_t ba; @@ -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 aa893e0c1c2438f546d8cc1d5ff8f9942998561c) +++ uspace/srv/bd/rd/rd.c (revision bd813861801556b8db9bf68757dadd65653cf582) @@ -39,5 +39,4 @@ */ -#include #include #include @@ -98,10 +97,10 @@ * Answer the first IPC_M_CONNECT_ME_TO call. */ - ipc_answer_0(iid, EOK); + async_answer_0(iid, EOK); /* * Now we wait for the client to send us its communication as_area. */ - int flags; + unsigned int flags; if (async_share_out_receive(&callid, &comm_size, &flags)) { fs_va = as_get_mappable_page(comm_size); @@ -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); } }