Changeset 36d852c in mainline for uspace/srv

Timestamp:

2007-12-23T19:45:30Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

654b7db

Parents:

5c786d1

Message:

Rename IPC_M_DATA_SEND to IPC_M_DATA_WRITE. Now, when we also add
IPC_M_DATA_READ, it will not clash and cause confusion with userspace wrappers
such as ipc_data_receive(). Rename the forementioned wrappers to
ipc_data_write_send(), ipc_data_write_receive() and ipc_data_write_deliver().

Location:

uspace/srv

Files:

• devmap/devmap.c (modified) (7 diffs)
• vfs/vfs_mount.c (modified) (4 diffs)
• vfs/vfs_open.c (modified) (2 diffs)
• vfs/vfs_register.c (modified) (2 diffs)

uspace/srv/devmap/devmap.c

@@ -203 +203 @@
          * Get driver name
          */
-        if (!ipc_data_receive(&callid, NULL, &name_size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
                 printf("Unexpected request.\n");
                 free(driver);
@@ -234 +234 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (EOK != ipc_data_deliver(callid, driver->name, name_size)) {
+        if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
                 printf("Cannot read driver name.\n");
                 free(driver->name);
@@ -369 +369 @@
         
         /* Get device name */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 free(device);
                 printf("Cannot read device name.\n");
@@ -395 +395 @@
         }
         
-        ipc_data_deliver(callid, device->name, size);
+        ipc_data_write_deliver(callid, device->name, size);
         device->name[size] = 0;
 
@@ -490 +490 @@
          * read the name itself until the buffer is allocated).
          */
-        if (!ipc_data_receive(&callid, NULL, &name_size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
                 ipc_answer_0(callid, EREFUSED);
                 ipc_answer_0(iid, EREFUSED);
@@ -514 +514 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (EOK != (retval = ipc_data_deliver(callid, name, name_size))) {
+        if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
                 ipc_answer_0(iid, EREFUSED);
                 return;
@@ -567 +567 @@
         sending must be initiated by client
 
-        int rc = ipc_data_send(phone, device->name, name_size); 
+        int rc = ipc_data_write_send(phone, device->name, name_size); 
         if (rc != EOK) {
                 async_wait_for(req, NULL);

uspace/srv/vfs/vfs_mount.c

@@ -87 +87 @@
          * system.
          */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -107 +107 @@
          */
         char fs_name[FS_NAME_MAXLEN + 1];
-        (void) ipc_data_deliver(callid, fs_name, size);
+        (void) ipc_data_write_deliver(callid, fs_name, size);
         fs_name[size] = '\0';
         
@@ -123 +123 @@
          * Now, we want the client to send us the mount point.
          */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -151 +151 @@
          * Deliver the mount point.
          */
-        (void) ipc_data_deliver(callid, buf, size);
+        (void) ipc_data_write_deliver(callid, buf, size);
 
         /*

uspace/srv/vfs/vfs_open.c

@@ -62 +62 @@
         ipc_callid_t callid;
 
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -83 +83 @@
 
         int rc;
-        if ((rc = ipc_data_deliver(callid, path, size))) {
+        if ((rc = ipc_data_write_deliver(callid, path, size))) {
                 ipc_answer_0(rid, rc);
                 free(path);

uspace/srv/vfs/vfs_register.c

@@ -165 +165 @@
          * VFS info structure from the client FS.
          */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 /*
                  * The client doesn't obey the same protocol as we do.
@@ -206 +206 @@
         futex_initialize(&fs_info->phone_futex, 1);
                 
-        rc = ipc_data_deliver(callid, &fs_info->vfs_info, size);
+        rc = ipc_data_write_deliver(callid, &fs_info->vfs_info, size);
         if (rc != EOK) {
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",