Changeset b5e68c8 in mainline for uspace/srv/bd/part/mbr_part/mbr_part.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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.

File:

• uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (13 diffs)

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -57 +57 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <ipc/bd.h>
 #include <async.h>
@@ -101 +100 @@
         aoff64_t length;
         /** Device representing the partition (outbound device) */
-        dev_handle_t dev;
+        devmap_handle_t dev;
         /** Points to next partition structure. */
         struct part *next;
@@ -142 +141 @@
 
 /** Partitioned device (inbound device) */
-static dev_handle_t indev_handle;
+static devmap_handle_t indev_handle;
 
 /** List of partitions. This structure is an empty head. */
@@ -181 +180 @@
         int i;
         char *name;
-        dev_handle_t dev;
+        devmap_handle_t dev;
         uint64_t size_mb;
         part_t *part;
@@ -206 +205 @@
 
         if (block_size < 512 || (block_size % 512) != 0) {
-                printf(NAME ": invalid block size %d.\n");
+                printf(NAME ": invalid block size %zu.\n", block_size);
                 return ENOTSUP;
         }
@@ -242 +241 @@
                 rc = devmap_device_register(name, &dev);
                 if (rc != EOK) {
-                        devmap_hangup_phone(DEVMAP_DRIVER);
                         printf(NAME ": Unable to register device %s.\n", name);
                         return rc;
@@ -393 +391 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
-        dev_handle_t dh;
-        int flags;
+        sysarg_t method;
+        devmap_handle_t dh;
+        unsigned int flags;
         int retval;
         uint64_t ba;
@@ -414 +412 @@
 
         if (part == NULL) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
@@ -421 +419 @@
 
         /* 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;
         }
@@ -430 +428 @@
         fs_va = as_get_mappable_page(comm_size);
         if (fs_va == NULL) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -438 +436 @@
         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:
@@ -465 +463 @@
                         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(part->length),
+                        async_answer_2(callid, EOK, LOWER32(part->length),
                             UPPER32(part->length));
                         continue;
@@ -475 +473 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }