Changes in uspace/srv/bd/rd/rd.c [f302586:15f3c3f] in mainline

File:

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

uspace/srv/bd/rd/rd.c

@@ -55 +55 @@
 #include <ipc/bd.h>
 #include <macros.h>
-#include <inttypes.h>
-
-#define NAME  "rd"
+
+#define NAME "rd"
 
 /** Pointer to the ramdisk's image */
@@ -105 +104 @@
         unsigned int flags;
         if (async_share_out_receive(&callid, &comm_size, &flags)) {
-                (void) async_share_out_finalize(callid, &fs_va);
-                if (fs_va == (void *) -1) {
+                fs_va = as_get_mappable_page(comm_size);
+                if (fs_va) {
+                        (void) async_share_out_finalize(callid, fs_va);
+                } else {
                         async_answer_0(callid, EHANGUP);
                         return;
@@ -207 +208 @@
 static bool rd_init(void)
 {
-        sysarg_t size;
-        int ret = sysinfo_get_value("rd.size", &size);
-        if ((ret != EOK) || (size == 0)) {
+        int ret = sysinfo_get_value("rd.size", &rd_size);
+        if ((ret != EOK) || (rd_size == 0)) {
                 printf("%s: No RAM disk found\n", NAME);
                 return false;
         }
         
-        sysarg_t addr_phys;
-        ret = sysinfo_get_value("rd.address.physical", &addr_phys);
-        if ((ret != EOK) || (addr_phys == 0)) {
+        sysarg_t rd_ph_addr;
+        ret = sysinfo_get_value("rd.address.physical", &rd_ph_addr);
+        if ((ret != EOK) || (rd_ph_addr == 0)) {
                 printf("%s: Invalid RAM disk physical address\n", NAME);
                 return false;
         }
         
-        rd_size = ALIGN_UP(size, block_size);
-        unsigned int flags =
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
-        
-        ret = physmem_map((void *) addr_phys,
-            ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags, &rd_addr);
-        if (ret != EOK) {
+        rd_addr = as_get_mappable_page(rd_size);
+        
+        int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
+        int retval = physmem_map((void *) rd_ph_addr, rd_addr,
+            ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
+        
+        if (retval < 0) {
                 printf("%s: Error mapping RAM disk\n", NAME);
                 return false;
         }
         
-        printf("%s: Found RAM disk at %p, %" PRIun " bytes\n", NAME,
-            (void *) addr_phys, size);
-        
-        async_set_client_connection(rd_connection);
-        ret = loc_server_register(NAME);
-        if (ret < 0) {
-                printf("%s: Unable to register driver (%d)\n", NAME, ret);
+        printf("%s: Found RAM disk at %p, %zu bytes\n", NAME,
+            (void *) rd_ph_addr, rd_size);
+        
+        int rc = loc_server_register(NAME, rd_connection);
+        if (rc < 0) {
+                printf("%s: Unable to register driver (%d)\n", NAME, rc);
                 return false;
         }
         
         service_id_t service_id;
-        ret = loc_service_register("bd/initrd", &service_id);
-        if (ret != EOK) {
+        if (loc_service_register("bd/initrd", &service_id) != EOK) {
                 printf("%s: Unable to register device service\n", NAME);
                 return false;