Changeset cf2af94 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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 mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (8 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <ipc/bd.h>
 #include <async.h>
@@ -120 +119 @@
         rc = devmap_device_register(device_name, &devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device '%s'.\n",
                         device_name);
@@ -177 +175 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         size_t comm_size;
-        int flags;
+        unsigned int flags;
         int retval;
         uint64_t ba;
@@ -185 +183 @@
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         if (!async_share_out_receive(&callid, &comm_size, &flags)) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -194 +192 @@
         fs_va = as_get_mappable_page(comm_size);
         if (fs_va == NULL) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -202 +200 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case BD_READ_BLOCKS:
@@ -229 +227 @@
                         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(num_blocks),
+                        async_answer_2(callid, EOK, LOWER32(num_blocks),
                             UPPER32(num_blocks));
                         continue;
@@ -239 +237 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }