Changes in uspace/srv/bd/rd/rd.c [47b7006:d9fae235] in mainline

File:

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

uspace/srv/bd/rd/rd.c

@@ -39 +39 @@
  */
 
+#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/ns.h>
@@ -97 +98 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        async_answer_0(iid, EOK);
+        ipc_answer_0(iid, EOK);
         
         /*
          * Now we wait for the client to send us its communication as_area.
          */
-        unsigned int flags;
+        int flags;
         if (async_share_out_receive(&callid, &comm_size, &flags)) {
                 fs_va = as_get_mappable_page(comm_size);
@@ -108 +109 @@
                         (void) async_share_out_finalize(callid, fs_va);
                 } else {
-                        async_answer_0(callid, EHANGUP);
+                        ipc_answer_0(callid, EHANGUP);
                         return;
                 }
@@ -117 +118 @@
                  * Close the connection.
                  */
-                async_answer_0(callid, EHANGUP);
+                ipc_answer_0(callid, EHANGUP);
                 return;
         }
@@ -123 +124 @@
         while (true) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /*
@@ -129 +130 @@
                          * Answer the message and exit the fibril.
                          */
-                        async_answer_0(callid, EOK);
+                        ipc_answer_0(callid, EOK);
                         return;
                 case BD_READ_BLOCKS:
@@ -152 +153 @@
                         break;
                 case BD_GET_BLOCK_SIZE:
-                        async_answer_1(callid, EOK, block_size);
+                        ipc_answer_1(callid, EOK, block_size);
                         continue;
                 case BD_GET_NUM_BLOCKS:
-                        async_answer_2(callid, EOK, LOWER32(rd_size / block_size),
+                        ipc_answer_2(callid, EOK, LOWER32(rd_size / block_size),
                             UPPER32(rd_size / block_size));
                         continue;
@@ -168 +169 @@
                         break;
                 }
-                async_answer_0(callid, retval);
+                ipc_answer_0(callid, retval);
         }
 }
@@ -229 +230 @@
         }
         
-        printf("%s: Found RAM disk at %p, %zu bytes\n", NAME,
-            (void *) rd_ph_addr, rd_size);
+        printf("%s: Found RAM disk at %p, %d bytes\n", NAME, rd_ph_addr, rd_size);
         
         int rc = devmap_driver_register(NAME, rd_connection);
@@ -238 +238 @@
         }
         
-        devmap_handle_t devmap_handle;
-        if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
+        dev_handle_t dev_handle;
+        if (devmap_device_register("bd/initrd", &dev_handle) != EOK) {
+                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf("%s: Unable to register device\n", NAME);
                 return false;