| 37,8 → 37,8 |
|---|
| |
| #include "libblock.h" |
| #include "../../srv/vfs/vfs.h" |
| #include "../../srv/rd/rd.h" |
| #include <ipc/devmap.h> |
| #include <ipc/bd.h> |
| #include <ipc/services.h> |
| #include <errno.h> |
| #include <sys/mman.h> |
| 146,9 → 146,8 |
|---|
| if (!com_area) { |
| return ENOMEM; |
| } |
| dev_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, |
| DEVMAP_CONNECT_TO_DEVICE, dev_handle); |
| |
| dev_phone = devmap_device_connect(dev_handle, IPC_FLAG_BLOCKING); |
| if (dev_phone < 0) { |
| munmap(com_area, com_size); |
| return dev_phone; |
| 477,7 → 476,7 |
|---|
| if (*bufpos == *buflen) { |
| /* Refill the communication buffer with a new block. */ |
| ipcarg_t retval; |
| int rc = async_req_2_1(devcon->dev_phone, RD_READ_BLOCK, |
| int rc = async_req_2_1(devcon->dev_phone, BD_READ_BLOCK, |
| *pos / block_size, block_size, &retval); |
| if ((rc != EOK) || (retval != EOK)) |
| return (rc != EOK ? rc : retval); |