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

Timestamp:

2010-01-10T12:16:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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 (moved) (moved from uspace/srv/part/mbr_part/mbr_part.c ) (4 diffs)

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

@@ -61 +61 @@
 #include <async.h>
 #include <as.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <devmap.h>
 #include <sys/types.h>
@@ -419 +419 @@
         ipc_answer_0(iid, EOK);
 
-        if (!ipc_share_out_receive(&callid, &comm_size, &flags)) {
+        if (!async_share_out_receive(&callid, &comm_size, &flags)) {
                 ipc_answer_0(callid, EHANGUP);
                 return;
@@ -430 +430 @@
         }
 
-        (void) ipc_share_out_finalize(callid, fs_va);
+        (void) async_share_out_finalize(callid, fs_va);
 
         while (1) {
@@ -463 +463 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
-
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(part->length),
+                            UPPER32(part->length));
+                        continue;
                 default:
                         retval = EINVAL;