Changeset 4f5dc18 in mainline for uspace/srv/fs/devfs/devfs_ops.c

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• uspace/srv/fs/devfs/devfs_ops.c (modified) (8 diffs)

uspace/srv/fs/devfs/devfs_ops.c

@@ -108 +108 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -121 +121 @@
         }
         
-        ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
+        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);
@@ -286 +286 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_read_receive(&callid, &size) ||
+        if (!async_data_read_receive(&callid, &size) ||
             size != sizeof(struct stat)) {
                 ipc_answer_0(callid, EINVAL);
@@ -315 +315 @@
         }
 
-        ipc_data_read_finalize(callid, &stat, sizeof(struct stat));
+        async_data_read_finalize(callid, &stat, sizeof(struct stat));
         ipc_answer_0(rid, EOK);
 }
@@ -340 +340 @@
                 
                 ipc_callid_t callid;
-                if (!ipc_data_read_receive(&callid, NULL)) {
+                if (!async_data_read_receive(&callid, NULL)) {
                         fibril_mutex_unlock(&devices_mutex);
                         ipc_answer_0(callid, EINVAL);
@@ -367 +367 @@
                 ipc_callid_t callid;
                 size_t size;
-                if (!ipc_data_read_receive(&callid, &size)) {
+                if (!async_data_read_receive(&callid, &size)) {
                         ipc_answer_0(callid, EINVAL);
                         ipc_answer_0(rid, EINVAL);
@@ -384 +384 @@
                 
                 if (pos < max) {
-                        ipc_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1);
+                        async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1);
                 } else {
                         ipc_answer_0(callid, ENOENT);
@@ -418 +418 @@
                 
                 ipc_callid_t callid;
-                if (!ipc_data_write_receive(&callid, NULL)) {
+                if (!async_data_write_receive(&callid, NULL)) {
                         fibril_mutex_unlock(&devices_mutex);
                         ipc_answer_0(callid, EINVAL);