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

Timestamp:

2010-01-10T12:16:59Z (14 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/rd/rd.c (modified) (4 diffs)

uspace/srv/bd/rd/rd.c

@@ -51 +51 @@
 #include <align.h>
 #include <async.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <stdio.h>
 #include <devmap.h>
@@ -102 +102 @@
          */
         int flags;
-        if (ipc_share_out_receive(&callid, &comm_size, &flags)) {
+        if (async_share_out_receive(&callid, &comm_size, &flags)) {
                 fs_va = as_get_mappable_page(comm_size);
                 if (fs_va) {
-                        (void) ipc_share_out_finalize(callid, fs_va);
+                        (void) async_share_out_finalize(callid, fs_va);
                 } else {
                         ipc_answer_0(callid, EHANGUP);
@@ -153 +153 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(rd_size / block_size),
+                            UPPER32(rd_size / block_size));
+                        continue;
                 default:
                         /*
@@ -228 +232 @@
         
         dev_handle_t dev_handle;
-        if (devmap_device_register("initrd", &dev_handle) != EOK) {
+        if (devmap_device_register("bd/initrd", &dev_handle) != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device\n");