Changeset cd50486 in mainline for uspace/srv/bd/rd/rd.c

Timestamp:

2011-02-06T22:03:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (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 development/ changes

File:

• uspace/srv/bd/rd/rd.c (modified) (7 diffs)

uspace/srv/bd/rd/rd.c

@@ -39 +39 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/ns.h>
@@ -98 +97 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         /*
          * Now we wait for the client to send us its communication as_area.
          */
-        int flags;
+        unsigned int flags;
         if (async_share_out_receive(&callid, &comm_size, &flags)) {
                 fs_va = as_get_mappable_page(comm_size);
@@ -109 +108 @@
                         (void) async_share_out_finalize(callid, fs_va);
                 } else {
-                        ipc_answer_0(callid, EHANGUP);
+                        async_answer_0(callid, EHANGUP);
                         return;
                 }
@@ -118 +117 @@
                  * Close the connection.
                  */
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -130 +129 @@
                          * Answer the message and exit the fibril.
                          */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case BD_READ_BLOCKS:
@@ -153 +152 @@
                         break;
                 case BD_GET_BLOCK_SIZE:
-                        ipc_answer_1(callid, EOK, block_size);
+                        async_answer_1(callid, EOK, block_size);
                         continue;
                 case BD_GET_NUM_BLOCKS:
-                        ipc_answer_2(callid, EOK, LOWER32(rd_size / block_size),
+                        async_answer_2(callid, EOK, LOWER32(rd_size / block_size),
                             UPPER32(rd_size / block_size));
                         continue;
@@ -169 +168 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }