Changeset 4198f9c3 in mainline for uspace/lib/libc
- Timestamp:
- 2009-06-28T13:43:15Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 852b801
- Parents:
- 6408be3
- Location:
- uspace/lib/libc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/libc/generic/vfs/vfs.c
r6408be3 r4198f9c3 138 138 vfs_connect(); 139 139 140 req = async_send_2(vfs_phone, VFS_ MOUNT, dev_handle, flags, NULL);140 req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL); 141 141 rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_size); 142 142 if (rc != EOK) { … … 199 199 vfs_connect(); 200 200 201 req = async_send_3(vfs_phone, VFS_ OPEN, lflag, oflag, 0, &answer);201 req = async_send_3(vfs_phone, VFS_IN_OPEN, lflag, oflag, 0, &answer); 202 202 rc = ipc_data_write_start(vfs_phone, pa, pa_size); 203 203 if (rc != EOK) { … … 231 231 232 232 ipc_call_t answer; 233 aid_t req = async_send_4(vfs_phone, VFS_ OPEN_NODE, node->fs_handle,233 aid_t req = async_send_4(vfs_phone, VFS_IN_OPEN_NODE, node->fs_handle, 234 234 node->dev_handle, node->index, oflag, &answer); 235 235 … … 253 253 vfs_connect(); 254 254 255 rc = async_req_1_0(vfs_phone, VFS_ CLOSE, fildes);255 rc = async_req_1_0(vfs_phone, VFS_IN_CLOSE, fildes); 256 256 257 257 async_serialize_end(); … … 271 271 vfs_connect(); 272 272 273 req = async_send_1(vfs_phone, VFS_ READ, fildes, &answer);273 req = async_send_1(vfs_phone, VFS_IN_READ, fildes, &answer); 274 274 rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte); 275 275 if (rc != EOK) { … … 298 298 vfs_connect(); 299 299 300 req = async_send_1(vfs_phone, VFS_ WRITE, fildes, &answer);300 req = async_send_1(vfs_phone, VFS_IN_WRITE, fildes, &answer); 301 301 rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte); 302 302 if (rc != EOK) { … … 322 322 323 323 ipcarg_t device; 324 ipcarg_t rc = async_req_1_1(vfs_phone, VFS_ DEVICE, fildes, &device);324 ipcarg_t rc = async_req_1_1(vfs_phone, VFS_IN_DEVICE, fildes, &device); 325 325 326 326 async_serialize_end(); … … 342 342 ipcarg_t dev_handle; 343 343 ipcarg_t index; 344 ipcarg_t rc = async_req_1_3(vfs_phone, VFS_ NODE, fildes, &fs_handle,344 ipcarg_t rc = async_req_1_3(vfs_phone, VFS_IN_NODE, fildes, &fs_handle, 345 345 &dev_handle, &index); 346 346 … … 363 363 vfs_connect(); 364 364 365 ipcarg_t rc = async_req_1_0(vfs_phone, VFS_ SYNC, fildes);365 ipcarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes); 366 366 367 367 async_serialize_end(); … … 380 380 381 381 ipcarg_t newoffs; 382 rc = async_req_3_1(vfs_phone, VFS_ SEEK, fildes, offset, whence,382 rc = async_req_3_1(vfs_phone, VFS_IN_SEEK, fildes, offset, whence, 383 383 &newoffs); 384 384 … … 400 400 vfs_connect(); 401 401 402 rc = async_req_2_0(vfs_phone, VFS_ TRUNCATE, fildes, length);402 rc = async_req_2_0(vfs_phone, VFS_IN_TRUNCATE, fildes, length); 403 403 async_serialize_end(); 404 404 futex_up(&vfs_phone_futex); … … 453 453 vfs_connect(); 454 454 455 req = async_send_1(vfs_phone, VFS_ MKDIR, mode, NULL);455 req = async_send_1(vfs_phone, VFS_IN_MKDIR, mode, NULL); 456 456 rc = ipc_data_write_start(vfs_phone, pa, pa_size); 457 457 if (rc != EOK) { … … 483 483 vfs_connect(); 484 484 485 req = async_send_0(vfs_phone, VFS_ UNLINK, NULL);485 req = async_send_0(vfs_phone, VFS_IN_UNLINK, NULL); 486 486 rc = ipc_data_write_start(vfs_phone, pa, pa_size); 487 487 if (rc != EOK) { … … 530 530 vfs_connect(); 531 531 532 req = async_send_0(vfs_phone, VFS_ RENAME, NULL);532 req = async_send_0(vfs_phone, VFS_IN_RENAME, NULL); 533 533 rc = ipc_data_write_start(vfs_phone, olda, olda_size); 534 534 if (rc != EOK) { -
uspace/lib/libc/include/ipc/console.h
r6408be3 r4198f9c3 40 40 41 41 typedef enum { 42 CONSOLE_GET_SIZE = VFS_ LAST_SRV,42 CONSOLE_GET_SIZE = VFS_OUT_LAST, 43 43 CONSOLE_GET_EVENT, 44 44 CONSOLE_GOTO, -
uspace/lib/libc/include/ipc/vfs.h
r6408be3 r4198f9c3 58 58 59 59 typedef enum { 60 VFS_OPEN_NODE = IPC_FIRST_USER_METHOD, 61 VFS_READ, 62 VFS_WRITE, 63 VFS_TRUNCATE, 64 VFS_MOUNT, 65 VFS_UNMOUNT, 66 VFS_DEVICE, 67 VFS_SYNC, 68 VFS_CLOSE, 69 VFS_LAST_CMN /* keep this the last member of this enum */ 70 } vfs_request_cmn_t; 60 VFS_IN_OPEN = IPC_FIRST_USER_METHOD, 61 VFS_IN_OPEN_NODE, 62 VFS_IN_READ, 63 VFS_IN_WRITE, 64 VFS_IN_SEEK, 65 VFS_IN_TRUNCATE, 66 VFS_IN_CLOSE, 67 VFS_IN_MOUNT, 68 VFS_IN_UNMOUNT, 69 VFS_IN_DEVICE, 70 VFS_IN_SYNC, 71 VFS_IN_REGISTER, 72 VFS_IN_MKDIR, 73 VFS_IN_UNLINK, 74 VFS_IN_RENAME, 75 VFS_IN_NODE 76 } vfs_in_request_t; 71 77 72 78 typedef enum { 73 VFS_LOOKUP = VFS_LAST_CMN, 74 VFS_MOUNTED, 75 VFS_DESTROY, 76 VFS_LAST_CLNT /* keep this the last member of this enum */ 77 } vfs_request_clnt_t; 78 79 typedef enum { 80 VFS_REGISTER = VFS_LAST_CMN, 81 VFS_OPEN, 82 VFS_SEEK, 83 VFS_MKDIR, 84 VFS_UNLINK, 85 VFS_RENAME, 86 VFS_NODE, 87 VFS_LAST_SRV /* keep this the last member of this enum */ 88 } vfs_request_srv_t; 79 VFS_OUT_OPEN_NODE = IPC_FIRST_USER_METHOD, 80 VFS_OUT_READ, 81 VFS_OUT_WRITE, 82 VFS_OUT_TRUNCATE, 83 VFS_OUT_CLOSE, 84 VFS_OUT_MOUNT, 85 VFS_OUT_MOUNTED, 86 VFS_OUT_UNMOUNT, 87 VFS_OUT_DEVICE, 88 VFS_OUT_SYNC, 89 VFS_OUT_LOOKUP, 90 VFS_OUT_DESTROY, 91 VFS_OUT_LAST 92 } vfs_out_request_t; 89 93 90 94 /*
Note:
See TracChangeset
for help on using the changeset viewer.