Changeset 4198f9c3 in mainline for uspace/lib/libc/generic/vfs/vfs.c

Timestamp:

2009-06-28T13:43:15Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

852b801

Parents:

6408be3

Message:

Separate the VFS input and output protocols.

File:

• uspace/lib/libc/generic/vfs/vfs.c (modified) (14 diffs)

uspace/lib/libc/generic/vfs/vfs.c

@@ -138 +138 @@
         vfs_connect();
         
-        req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL);
+        req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
         rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -199 +199 @@
         vfs_connect();
         
-        req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
+        req = async_send_3(vfs_phone, VFS_IN_OPEN, lflag, oflag, 0, &answer);
         rc = ipc_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
@@ -231 +231 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_4(vfs_phone, VFS_OPEN_NODE, node->fs_handle,
+        aid_t req = async_send_4(vfs_phone, VFS_IN_OPEN_NODE, node->fs_handle,
             node->dev_handle, node->index, oflag, &answer);
         
@@ -253 +253 @@
         vfs_connect();
         
-        rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes);
+        rc = async_req_1_0(vfs_phone, VFS_IN_CLOSE, fildes);
         
         async_serialize_end();
@@ -271 +271 @@
         vfs_connect();
         
-        req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
+        req = async_send_1(vfs_phone, VFS_IN_READ, fildes, &answer);
         rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte);
         if (rc != EOK) {
@@ -298 +298 @@
         vfs_connect();
         
-        req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
+        req = async_send_1(vfs_phone, VFS_IN_WRITE, fildes, &answer);
         rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte);
         if (rc != EOK) {
@@ -322 +322 @@
         
         ipcarg_t device;
-        ipcarg_t rc = async_req_1_1(vfs_phone, VFS_DEVICE, fildes, &device);
+        ipcarg_t rc = async_req_1_1(vfs_phone, VFS_IN_DEVICE, fildes, &device);
         
         async_serialize_end();
@@ -342 +342 @@
         ipcarg_t dev_handle;
         ipcarg_t index;
-        ipcarg_t rc = async_req_1_3(vfs_phone, VFS_NODE, fildes, &fs_handle,
+        ipcarg_t rc = async_req_1_3(vfs_phone, VFS_IN_NODE, fildes, &fs_handle,
             &dev_handle, &index);
         
@@ -363 +363 @@
         vfs_connect();
         
-        ipcarg_t rc = async_req_1_0(vfs_phone, VFS_SYNC, fildes);
+        ipcarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes);
         
         async_serialize_end();
@@ -380 +380 @@
         
         ipcarg_t newoffs;
-        rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence,
+        rc = async_req_3_1(vfs_phone, VFS_IN_SEEK, fildes, offset, whence,
             &newoffs);
 
@@ -400 +400 @@
         vfs_connect();
         
-        rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length);
+        rc = async_req_2_0(vfs_phone, VFS_IN_TRUNCATE, fildes, length);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
@@ -453 +453 @@
         vfs_connect();
         
-        req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
+        req = async_send_1(vfs_phone, VFS_IN_MKDIR, mode, NULL);
         rc = ipc_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
@@ -483 +483 @@
         vfs_connect();
         
-        req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
+        req = async_send_0(vfs_phone, VFS_IN_UNLINK, NULL);
         rc = ipc_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
@@ -530 +530 @@
         vfs_connect();
         
-        req = async_send_0(vfs_phone, VFS_RENAME, NULL);
+        req = async_send_0(vfs_phone, VFS_IN_RENAME, NULL);
         rc = ipc_data_write_start(vfs_phone, olda, olda_size);
         if (rc != EOK) {